update po's

author: Carsten Haitzler (Rasterman) <raster@rasterman.com> 2013-05-06 17:33:39 +0900
committer: Carsten Haitzler (Rasterman) <raster@rasterman.com> 2013-05-06 17:33:39 +0900
commit: b17a694f0488b8b9612a1583935d77f20af7380d (patch)
tree: 747222227b76718da096c489fa1eceecc1ff7138 /po/zh_CN.po
parent: 60c687415a88f2d136146574aaaaaccb3058e4ca (diff)
download: enlightenment-b17a694f0488b8b9612a1583935d77f20af7380d.tar.gz
1 files changed, 4706 insertions, 2765 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2d25b4e7fa..4a7de33c34 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-03-31 12:24+0900\n"
+"POT-Creation-Date: 2013-05-06 11:45+0900\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"
@@ -26,17 +26,19 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "关于 Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2992 src/bin/e_config_dialog.c:288
-#: src/bin/e_fm.c:1079 src/bin/e_int_border_menu.c:194
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2990 src/bin/e_config_dialog.c:288
+#: src/bin/e_fm.c:1079 src/bin/e_int_border_menu.c:193
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
+#: src/modules/conf/e_conf.c:179
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:868
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1201
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2510 src/modules/mixer/app_mixer.c:502
 msgid "Close"
 msgstr "关闭"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:3364 src/bin/e_actions.c:3368
-#: src/bin/e_actions.c:3372 src/bin/e_int_menus.c:224 src/bin/e_main.c:635
+#: src/bin/e_about.c:21 src/bin/e_actions.c:3362 src/bin/e_actions.c:3366
+#: src/bin/e_actions.c:3370 src/bin/e_int_menus.c:224 src/bin/e_main.c:671
 #: src/modules/conf_interaction/e_int_config_mouse.c:176
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:242
 #: src/modules/wizard/page_000.c:34
@@ -59,7 +61,7 @@ msgstr ""
 msgid "<title>The Team</><br><br>"
 msgstr "<title>开发组</><br><br>"
 
-#: src/bin/e_actions.c:360
+#: src/bin/e_actions.c:358
 #, c-format
 msgid ""
 "You are about to kill %s.<br><br>Please keep in mind that all data from this "
@@ -69,433 +71,433 @@ msgstr ""
 "您正要杀死 %s。<br><br>请注意窗口内所有没保存的信息<br>都将丢失！<br><br>确定"
 "要杀死这个窗口吗？"
 
-#: src/bin/e_actions.c:372
+#: src/bin/e_actions.c:370
 msgid "Are you sure you want to kill this window?"
 msgstr "确定要杀死这个窗口吗？"
 
-#: src/bin/e_actions.c:375 src/bin/e_actions.c:2997
-#: src/bin/e_int_border_menu.c:749
+#: src/bin/e_actions.c:373 src/bin/e_actions.c:2995
+#: src/bin/e_int_border_menu.c:748
 msgid "Kill"
 msgstr "杀死"
 
-#: src/bin/e_actions.c:377 src/bin/e_actions.c:2128 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:1244 src/bin/e_fm.c:10451 src/bin/e_fm.c:10817
+#: src/bin/e_actions.c:375 src/bin/e_actions.c:2126 src/bin/e_actions.c:2220
+#: 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:53
+#: src/bin/e_desklock.c:1244 src/bin/e_fm.c:10472 src/bin/e_fm.c:10838
 #: src/bin/e_screensaver.c:190
 #: src/modules/quickaccess/e_mod_quickaccess.c:1267
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:2123 src/bin/e_actions.c:3368 src/bin/e_int_menus.c:253
+#: src/bin/e_actions.c:2121 src/bin/e_actions.c:3366 src/bin/e_int_menus.c:253
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2124
+#: src/bin/e_actions.c:2122
 msgid "Are you sure you want to exit Enlightenment?"
 msgstr "您确定要退出吗 Enlightenment？"
 
-#: src/bin/e_actions.c:2126 src/bin/e_actions.c:2220 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_actions.c:2124 src/bin/e_actions.c:2218 src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2338 src/bin/e_actions.c:2403 src/bin/e_actions.c:2468
 #: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1242
-#: src/bin/e_fm.c:10454 src/bin/e_screensaver.c:188
+#: src/bin/e_fm.c:10475 src/bin/e_screensaver.c:188
 #: src/modules/quickaccess/e_mod_quickaccess.c:1267
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:2217
+#: src/bin/e_actions.c:2215
 msgid "Logout"
 msgstr "注销"
 
-#: src/bin/e_actions.c:2218
+#: src/bin/e_actions.c:2216
 msgid "Are you sure you want to logout?"
 msgstr "您确定要注销吗？"
 
-#: src/bin/e_actions.c:2276 src/bin/e_sys.c:750
+#: src/bin/e_actions.c:2274 src/bin/e_sys.c:750
 msgid "Power off"
 msgstr "关机"
 
-#: src/bin/e_actions.c:2278
+#: src/bin/e_actions.c:2276
 msgid "Are you sure you want to power off your computer?"
 msgstr "您确定要关闭您的电脑吗？"
 
-#: src/bin/e_actions.c:2337 src/bin/e_actions.c:3411
+#: src/bin/e_actions.c:2335 src/bin/e_actions.c:3409
 msgid "Reboot"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2338
+#: src/bin/e_actions.c:2336
 msgid "Are you sure you want to reboot your computer?"
 msgstr "您确定要重启您的电脑吗？"
 
-#: src/bin/e_actions.c:2402 src/bin/e_actions.c:3419
+#: src/bin/e_actions.c:2400 src/bin/e_actions.c:3417
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:2403
+#: src/bin/e_actions.c:2401
 msgid "Are you sure you want to suspend your computer?"
 msgstr "您确定要挂起您的电脑吗？"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:3423
+#: src/bin/e_actions.c:2465 src/bin/e_actions.c:3421
 #: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2468
+#: src/bin/e_actions.c:2466
 msgid "Are you sure you want to hibernate your computer?"
 msgstr "您确定要休眠您的电脑吗？"
 
-#: src/bin/e_actions.c:2952 src/bin/e_actions.c:2963 src/bin/e_actions.c:2982
-#: src/bin/e_actions.c:2987 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997
-#: src/bin/e_actions.c:3280 src/bin/e_actions.c:3284 src/bin/e_actions.c:3289
-#: src/bin/e_actions.c:3295 src/bin/e_actions.c:3301 src/bin/e_actions.c:3307
-#: src/modules/shot/e_mod_main.c:984
+#: src/bin/e_actions.c:2950 src/bin/e_actions.c:2961 src/bin/e_actions.c:2980
+#: src/bin/e_actions.c:2985 src/bin/e_actions.c:2990 src/bin/e_actions.c:2995
+#: src/bin/e_actions.c:3278 src/bin/e_actions.c:3282 src/bin/e_actions.c:3287
+#: src/bin/e_actions.c:3293 src/bin/e_actions.c:3299 src/bin/e_actions.c:3305
+#: src/modules/shot/e_mod_main.c:981
 msgid "Window : Actions"
 msgstr "窗口：动作"
 
-#: src/bin/e_actions.c:2952 src/bin/e_fm.c:11583
-#: src/bin/e_int_border_menu.c:669
+#: src/bin/e_actions.c:2950 src/bin/e_fm.c:11604
+#: src/bin/e_int_border_menu.c:668
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:2963 src/bin/e_int_border_menu.c:683
+#: src/bin/e_actions.c:2961 src/bin/e_int_border_menu.c:682
 msgid "Resize"
 msgstr "改变大小"
 
-#: src/bin/e_actions.c:2974 src/bin/e_actions.c:3335 src/bin/e_actions.c:3337
-#: src/bin/e_actions.c:3339 src/bin/e_actions.c:3341 src/bin/e_actions.c:3343
+#: src/bin/e_actions.c:2972 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
+#: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "菜单"
 
-#: src/bin/e_actions.c:2974
+#: src/bin/e_actions.c:2972
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2982 src/bin/e_int_border_menu.c:1052
+#: src/bin/e_actions.c:2980 src/bin/e_int_border_menu.c:1064
 #: src/modules/winlist/e_int_config_winlist.c:203
 msgid "Raise"
 msgstr "提升"
 
-#: src/bin/e_actions.c:2987 src/bin/e_int_border_menu.c:1060
+#: src/bin/e_actions.c:2985 src/bin/e_int_border_menu.c:1072
 msgid "Lower"
 msgstr "降低"
 
-#: src/bin/e_actions.c:3002 src/bin/e_actions.c:3006 src/bin/e_actions.c:3011
-#: src/bin/e_actions.c:3015 src/bin/e_actions.c:3020 src/bin/e_actions.c:3024
-#: src/bin/e_actions.c:3029 src/bin/e_actions.c:3031 src/bin/e_actions.c:3034
-#: src/bin/e_actions.c:3037 src/bin/e_actions.c:3040 src/bin/e_actions.c:3043
-#: src/bin/e_actions.c:3045 src/bin/e_actions.c:3047 src/bin/e_actions.c:3049
-#: src/bin/e_actions.c:3056 src/bin/e_actions.c:3058 src/bin/e_actions.c:3060
-#: src/bin/e_actions.c:3062 src/bin/e_actions.c:3064 src/bin/e_actions.c:3068
-#: src/bin/e_actions.c:3073 src/bin/e_actions.c:3078 src/bin/e_actions.c:3084
-#: src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3000 src/bin/e_actions.c:3004 src/bin/e_actions.c:3009
+#: src/bin/e_actions.c:3013 src/bin/e_actions.c:3018 src/bin/e_actions.c:3022
+#: src/bin/e_actions.c:3027 src/bin/e_actions.c:3029 src/bin/e_actions.c:3032
+#: src/bin/e_actions.c:3035 src/bin/e_actions.c:3038 src/bin/e_actions.c:3041
+#: src/bin/e_actions.c:3043 src/bin/e_actions.c:3045 src/bin/e_actions.c:3047
+#: src/bin/e_actions.c:3054 src/bin/e_actions.c:3056 src/bin/e_actions.c:3058
+#: src/bin/e_actions.c:3060 src/bin/e_actions.c:3062 src/bin/e_actions.c:3066
+#: src/bin/e_actions.c:3071 src/bin/e_actions.c:3076 src/bin/e_actions.c:3082
+#: src/bin/e_actions.c:3088
 msgid "Window : State"
 msgstr "窗口：状态"
 
-#: src/bin/e_actions.c:3002
+#: src/bin/e_actions.c:3000
 msgid "Sticky Mode Toggle"
 msgstr "粘滞模式切换"
 
-#: src/bin/e_actions.c:3006
+#: src/bin/e_actions.c:3004
 msgid "Sticky Mode Enable"
 msgstr "粘滞模式开启"
 
-#: src/bin/e_actions.c:3011
+#: src/bin/e_actions.c:3009
 msgid "Iconic Mode Toggle"
 msgstr "图标模式切换"
 
-#: src/bin/e_actions.c:3015
+#: src/bin/e_actions.c:3013
 msgid "Iconic Mode Enable"
 msgstr "图标模式开启"
 
-#: src/bin/e_actions.c:3020
+#: src/bin/e_actions.c:3018
 msgid "Fullscreen Mode Toggle"
 msgstr "全屏状态切换"
 
-#: src/bin/e_actions.c:3024
+#: src/bin/e_actions.c:3022
 msgid "Fullscreen Mode Enable"
 msgstr "全屏模式开启"
 
-#: src/bin/e_actions.c:3029 src/bin/e_int_border_menu.c:384
-#: src/bin/e_int_border_menu.c:644
+#: src/bin/e_actions.c:3027 src/bin/e_int_border_menu.c:383
+#: src/bin/e_int_border_menu.c:643
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:3031 src/bin/e_int_border_menu.c:395
+#: src/bin/e_actions.c:3029 src/bin/e_int_border_menu.c:394
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:3034 src/bin/e_int_border_menu.c:406
+#: src/bin/e_actions.c:3032 src/bin/e_int_border_menu.c:405
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:3037 src/bin/e_int_border_menu.c:417
+#: src/bin/e_actions.c:3035 src/bin/e_int_border_menu.c:416
 msgid "Maximize Left"
 msgstr "左屏最大化"
 
-#: src/bin/e_actions.c:3040 src/bin/e_int_border_menu.c:428
+#: src/bin/e_actions.c:3038 src/bin/e_int_border_menu.c:427
 msgid "Maximize Right"
 msgstr "右屏最大化"
 
-#: src/bin/e_actions.c:3043
+#: src/bin/e_actions.c:3041
 msgid "Maximize Fullscreen"
 msgstr "全屏最大化"
 
-#: src/bin/e_actions.c:3045
+#: src/bin/e_actions.c:3043
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化模式“智能”"
 
-#: src/bin/e_actions.c:3047
+#: src/bin/e_actions.c:3045
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化模式“扩展”"
 
-#: src/bin/e_actions.c:3049
+#: src/bin/e_actions.c:3047
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化模式“填充”"
 
-#: src/bin/e_actions.c:3056
+#: src/bin/e_actions.c:3054
 msgid "Shade Up Mode Toggle"
 msgstr "切换至上阴影模式"
 
-#: src/bin/e_actions.c:3058
+#: src/bin/e_actions.c:3056
 msgid "Shade Down Mode Toggle"
 msgstr "切换至下阴影模式"
 
-#: src/bin/e_actions.c:3060
+#: src/bin/e_actions.c:3058
 msgid "Shade Left Mode Toggle"
 msgstr "切换至左阴影模式"
 
-#: src/bin/e_actions.c:3062
+#: src/bin/e_actions.c:3060
 msgid "Shade Right Mode Toggle"
 msgstr "切换至右阴影模式"
 
-#: src/bin/e_actions.c:3064
+#: src/bin/e_actions.c:3062
 msgid "Shade Mode Toggle"
 msgstr "切换阴影模式"
 
-#: src/bin/e_actions.c:3068
+#: src/bin/e_actions.c:3066
 msgid "Set Shaded State"
 msgstr "设置卷起状态"
 
-#: src/bin/e_actions.c:3069
+#: src/bin/e_actions.c:3067
 msgid "syntax: \"(0|1) (up|down|left|right)\""
 msgstr "语法: \"(0|1) (up|down|left|right)\""
 
-#: src/bin/e_actions.c:3073
+#: src/bin/e_actions.c:3071
 msgid "Toggle Borderless State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:3078
+#: src/bin/e_actions.c:3076
 msgid "Set Border"
 msgstr "设置边框"
 
-#: src/bin/e_actions.c:3084
+#: src/bin/e_actions.c:3082
 msgid "Cycle between Borders"
 msgstr "在边框间循环"
 
-#: src/bin/e_actions.c:3090
+#: src/bin/e_actions.c:3088
 msgid "Toggle Pinned State"
 msgstr "切换粘附状态"
 
-#: src/bin/e_actions.c:3095 src/bin/e_actions.c:3097 src/bin/e_actions.c:3099
-#: src/bin/e_actions.c:3101 src/bin/e_actions.c:3103 src/bin/e_actions.c:3109
-#: src/bin/e_actions.c:3114 src/bin/e_actions.c:3120 src/bin/e_actions.c:3125
-#: src/bin/e_actions.c:3131 src/bin/e_actions.c:3137 src/bin/e_actions.c:3139
-#: src/bin/e_actions.c:3141 src/bin/e_actions.c:3143 src/bin/e_actions.c:3145
-#: src/bin/e_actions.c:3147 src/bin/e_actions.c:3149 src/bin/e_actions.c:3151
-#: src/bin/e_actions.c:3153 src/bin/e_actions.c:3155 src/bin/e_actions.c:3157
-#: src/bin/e_actions.c:3159 src/bin/e_actions.c:3161 src/bin/e_actions.c:3167
-#: src/bin/e_actions.c:3169 src/bin/e_actions.c:3171 src/bin/e_actions.c:3173
-#: src/bin/e_actions.c:3175 src/bin/e_actions.c:3181 src/bin/e_actions.c:3187
-#: src/bin/e_actions.c:3193 src/bin/e_actions.c:3198 src/bin/e_actions.c:3200
-#: src/bin/e_actions.c:3202 src/bin/e_actions.c:3204 src/bin/e_actions.c:3206
-#: src/bin/e_actions.c:3208 src/bin/e_actions.c:3210 src/bin/e_actions.c:3212
-#: src/bin/e_actions.c:3214 src/bin/e_actions.c:3216 src/bin/e_actions.c:3218
-#: src/bin/e_actions.c:3220 src/bin/e_actions.c:3222 src/bin/e_actions.c:3435
-#: src/bin/e_actions.c:3440 src/bin/e_int_menus.c:186
+#: src/bin/e_actions.c:3093 src/bin/e_actions.c:3095 src/bin/e_actions.c:3097
+#: src/bin/e_actions.c:3099 src/bin/e_actions.c:3101 src/bin/e_actions.c:3107
+#: src/bin/e_actions.c:3112 src/bin/e_actions.c:3118 src/bin/e_actions.c:3123
+#: src/bin/e_actions.c:3129 src/bin/e_actions.c:3135 src/bin/e_actions.c:3137
+#: src/bin/e_actions.c:3139 src/bin/e_actions.c:3141 src/bin/e_actions.c:3143
+#: src/bin/e_actions.c:3145 src/bin/e_actions.c:3147 src/bin/e_actions.c:3149
+#: src/bin/e_actions.c:3151 src/bin/e_actions.c:3153 src/bin/e_actions.c:3155
+#: src/bin/e_actions.c:3157 src/bin/e_actions.c:3159 src/bin/e_actions.c:3165
+#: src/bin/e_actions.c:3167 src/bin/e_actions.c:3169 src/bin/e_actions.c:3171
+#: src/bin/e_actions.c:3173 src/bin/e_actions.c:3179 src/bin/e_actions.c:3185
+#: src/bin/e_actions.c:3191 src/bin/e_actions.c:3196 src/bin/e_actions.c:3198
+#: src/bin/e_actions.c:3200 src/bin/e_actions.c:3202 src/bin/e_actions.c:3204
+#: src/bin/e_actions.c:3206 src/bin/e_actions.c:3208 src/bin/e_actions.c:3210
+#: src/bin/e_actions.c:3212 src/bin/e_actions.c:3214 src/bin/e_actions.c:3216
+#: src/bin/e_actions.c:3218 src/bin/e_actions.c:3220 src/bin/e_actions.c:3433
+#: src/bin/e_actions.c:3438 src/bin/e_int_menus.c:186
 #: src/bin/e_int_shelf_config.c:269
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:118
 #: src/modules/fileman/e_mod_menu.c:425 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:3095
+#: src/bin/e_actions.c:3093
 msgid "Flip Desktop Left"
 msgstr "向左翻转桌面"
 
-#: src/bin/e_actions.c:3097
+#: src/bin/e_actions.c:3095
 msgid "Flip Desktop Right"
 msgstr "向右翻转桌面"
 
-#: src/bin/e_actions.c:3099
+#: src/bin/e_actions.c:3097
 msgid "Flip Desktop Up"
 msgstr "向上翻转桌面"
 
-#: src/bin/e_actions.c:3101
+#: src/bin/e_actions.c:3099
 msgid "Flip Desktop Down"
 msgstr "向下翻转桌面"
 
-#: src/bin/e_actions.c:3103
+#: src/bin/e_actions.c:3101
 msgid "Flip Desktop By..."
 msgstr "翻转桌面，依据..."
 
-#: src/bin/e_actions.c:3109
+#: src/bin/e_actions.c:3107
 msgid "Flip To Previous Desktop"
 msgstr "翻转到上一个桌面"
 
-#: src/bin/e_actions.c:3114
+#: src/bin/e_actions.c:3112
 msgid "Show The Desktop"
 msgstr "显示桌面"
 
-#: src/bin/e_actions.c:3120
+#: src/bin/e_actions.c:3118
 msgid "Show The Shelf"
 msgstr "显示书架"
 
-#: src/bin/e_actions.c:3125
+#: src/bin/e_actions.c:3123
 msgid "Flip Desktop To..."
 msgstr "翻转桌面到..."
 
-#: src/bin/e_actions.c:3131
+#: src/bin/e_actions.c:3129
 msgid "Flip Desktop Linearly..."
 msgstr "线性翻转桌面到..."
 
-#: src/bin/e_actions.c:3137
+#: src/bin/e_actions.c:3135
 msgid "Switch To Desktop 0"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:3139
+#: src/bin/e_actions.c:3137
 msgid "Switch To Desktop 1"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:3141
+#: src/bin/e_actions.c:3139
 msgid "Switch To Desktop 2"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:3143
+#: src/bin/e_actions.c:3141
 msgid "Switch To Desktop 3"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:3145
+#: src/bin/e_actions.c:3143
 msgid "Switch To Desktop 4"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:3147
+#: src/bin/e_actions.c:3145
 msgid "Switch To Desktop 5"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:3149
+#: src/bin/e_actions.c:3147
 msgid "Switch To Desktop 6"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:3151
+#: src/bin/e_actions.c:3149
 msgid "Switch To Desktop 7"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:3153
+#: src/bin/e_actions.c:3151
 msgid "Switch To Desktop 8"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:3155
+#: src/bin/e_actions.c:3153
 msgid "Switch To Desktop 9"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:3157
+#: src/bin/e_actions.c:3155
 msgid "Switch To Desktop 10"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:3159
+#: src/bin/e_actions.c:3157
 msgid "Switch To Desktop 11"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:3161
+#: src/bin/e_actions.c:3159
 msgid "Switch To Desktop..."
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:3167
+#: src/bin/e_actions.c:3165
 msgid "Flip Desktop Left (All Screens)"
 msgstr "向左翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:3169
+#: src/bin/e_actions.c:3167
 msgid "Flip Desktop Right (All Screens)"
 msgstr "向右翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:3171
+#: src/bin/e_actions.c:3169
 msgid "Flip Desktop Up (All Screens)"
 msgstr "向上翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:3173
+#: src/bin/e_actions.c:3171
 msgid "Flip Desktop Down (All Screens)"
 msgstr "向下翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:3175
+#: src/bin/e_actions.c:3173
 msgid "Flip Desktop By... (All Screens)"
 msgstr "翻转桌面的方式...(全部屏幕)"
 
-#: src/bin/e_actions.c:3181
+#: src/bin/e_actions.c:3179
 msgid "Flip Desktop To... (All Screens)"
 msgstr "翻转桌面到...(全部屏幕)"
 
-#: src/bin/e_actions.c:3187
+#: src/bin/e_actions.c:3185
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "线性翻转桌面...(全部屏幕)"
 
-#: src/bin/e_actions.c:3193
+#: src/bin/e_actions.c:3191
 msgid "Flip Desktop In Direction..."
 msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:3198
+#: src/bin/e_actions.c:3196
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切换到桌面 0(全部屏幕)"
 
-#: src/bin/e_actions.c:3200
+#: src/bin/e_actions.c:3198
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切换到桌面 1(全部屏幕)"
 
-#: src/bin/e_actions.c:3202
+#: src/bin/e_actions.c:3200
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切换到桌面 2(全部屏幕)"
 
-#: src/bin/e_actions.c:3204
+#: src/bin/e_actions.c:3202
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切换到桌面 3(全部屏幕)"
 
-#: src/bin/e_actions.c:3206
+#: src/bin/e_actions.c:3204
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切换到桌面 4(全部屏幕)"
 
-#: src/bin/e_actions.c:3208
+#: src/bin/e_actions.c:3206
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切换到桌面 5(全部屏幕)"
 
-#: src/bin/e_actions.c:3210
+#: src/bin/e_actions.c:3208
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切换到桌面 6(全部屏幕)"
 
-#: src/bin/e_actions.c:3212
+#: src/bin/e_actions.c:3210
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切换到桌面 7(全部屏幕)"
 
-#: src/bin/e_actions.c:3214
+#: src/bin/e_actions.c:3212
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切换到桌面 8(全部屏幕)"
 
-#: src/bin/e_actions.c:3216
+#: src/bin/e_actions.c:3214
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切换到桌面 9(全部屏幕)"
 
-#: src/bin/e_actions.c:3218
+#: src/bin/e_actions.c:3216
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切换到桌面 10(全部屏幕)"
 
-#: src/bin/e_actions.c:3220
+#: src/bin/e_actions.c:3218
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切换到桌面 11(全部屏幕)"
 
-#: src/bin/e_actions.c:3222
+#: src/bin/e_actions.c:3220
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切换到桌面 ...(全部屏幕)"
 
-#: src/bin/e_actions.c:3228 src/bin/e_actions.c:3232
+#: src/bin/e_actions.c:3226 src/bin/e_actions.c:3230
 #: src/modules/winlist/e_mod_main.c:41 src/modules/winlist/e_mod_main.c:43
 #: src/modules/winlist/e_mod_main.c:45 src/modules/winlist/e_mod_main.c:48
 #: src/modules/winlist/e_mod_main.c:51 src/modules/winlist/e_mod_main.c:54
@@ -504,283 +506,285 @@ msgstr "切换到桌面 ...(全部屏幕)"
 msgid "Window : List"
 msgstr "窗口：列表"
 
-#: src/bin/e_actions.c:3228
+#: src/bin/e_actions.c:3226
 msgid "Jump to window..."
 msgstr "跳转到桌面..."
 
-#: src/bin/e_actions.c:3232
+#: src/bin/e_actions.c:3230
 msgid "Jump to window... or start..."
 msgstr "跳转到桌面... 或开始..."
 
-#: src/bin/e_actions.c:3237 src/bin/e_actions.c:3239 src/bin/e_actions.c:3241
-#: src/bin/e_actions.c:3247 src/bin/e_actions.c:3249 src/bin/e_actions.c:3251
-#: src/bin/e_actions.c:3256 src/bin/e_actions.c:3259 src/bin/e_actions.c:3262
-#: src/bin/e_actions.c:3264 src/bin/e_actions.c:3266 src/bin/e_actions.c:3268
-#: src/bin/e_actions.c:3271 src/bin/e_actions.c:3273 src/bin/e_actions.c:3275
+#: src/bin/e_actions.c:3235 src/bin/e_actions.c:3237 src/bin/e_actions.c:3239
+#: src/bin/e_actions.c:3245 src/bin/e_actions.c:3247 src/bin/e_actions.c:3249
+#: src/bin/e_actions.c:3254 src/bin/e_actions.c:3257 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:453
 #: src/modules/conf_display/e_mod_main.c:17
 #: src/modules/conf_randr/e_mod_main.c:16 src/modules/ibox/e_mod_config.c:135
-#: src/modules/shot/e_mod_main.c:743 src/modules/shot/e_mod_main.c:977
+#: src/modules/shot/e_mod_main.c:740 src/modules/shot/e_mod_main.c:974
 msgid "Screen"
 msgstr "屏幕"
 
-#: src/bin/e_actions.c:3237
+#: src/bin/e_actions.c:3235
 msgid "Send Mouse To Screen 0"
 msgstr "发送鼠标到屏幕 0"
 
-#: src/bin/e_actions.c:3239
+#: src/bin/e_actions.c:3237
 msgid "Send Mouse To Screen 1"
 msgstr "发送鼠标到屏幕 1"
 
-#: src/bin/e_actions.c:3241
+#: src/bin/e_actions.c:3239
 msgid "Send Mouse To Screen..."
 msgstr "发送鼠标到屏幕 ..."
 
-#: src/bin/e_actions.c:3247
+#: src/bin/e_actions.c:3245
 msgid "Send Mouse Forward 1 Screen"
 msgstr "发送鼠标到前 1 屏"
 
-#: src/bin/e_actions.c:3249
+#: src/bin/e_actions.c:3247
 msgid "Send Mouse Back 1 Screen"
 msgstr "发送鼠标到后 1 屏"
 
-#: src/bin/e_actions.c:3251
+#: src/bin/e_actions.c:3249
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "发送鼠标到 前一个/后一个 屏幕..."
 
-#: src/bin/e_actions.c:3256
+#: src/bin/e_actions.c:3254
 msgid "Dim"
 msgstr "变暗"
 
-#: src/bin/e_actions.c:3259
+#: src/bin/e_actions.c:3257
 msgid "Undim"
 msgstr "变亮"
 
-#: src/bin/e_actions.c:3262
+#: src/bin/e_actions.c:3260
 msgid "Backlight Set"
 msgstr "背光设置"
 
-#: src/bin/e_actions.c:3264
+#: src/bin/e_actions.c:3262
 msgid "Backlight Min"
 msgstr "最小背光"
 
-#: src/bin/e_actions.c:3266
+#: src/bin/e_actions.c:3264
 msgid "Backlight Mid"
 msgstr "中等背光"
 
-#: src/bin/e_actions.c:3268
+#: src/bin/e_actions.c:3266
 msgid "Backlight Max"
 msgstr "最大背光"
 
-#: src/bin/e_actions.c:3271
+#: src/bin/e_actions.c:3269
 msgid "Backlight Adjust"
 msgstr "背光调节"
 
-#: src/bin/e_actions.c:3273
+#: src/bin/e_actions.c:3271
 msgid "Backlight Up"
 msgstr "加大背光"
 
-#: src/bin/e_actions.c:3275
+#: src/bin/e_actions.c:3273
 msgid "Backlight Down"
 msgstr "降低背光"
 
-#: src/bin/e_actions.c:3280
+#: src/bin/e_actions.c:3278
 msgid "Move To Center"
 msgstr "移至中心位置"
 
-#: src/bin/e_actions.c:3284
+#: src/bin/e_actions.c:3282
 msgid "Move To Coordinates..."
 msgstr "移至坐标..."
 
-#: src/bin/e_actions.c:3289
+#: src/bin/e_actions.c:3287
 msgid "Move By Coordinate Offset..."
 msgstr "移动，按坐标偏移..."
 
-#: src/bin/e_actions.c:3295
+#: src/bin/e_actions.c:3293
 msgid "Resize By..."
 msgstr "改变大小，按照..."
 
-#: src/bin/e_actions.c:3301
+#: src/bin/e_actions.c:3299
 #, fuzzy
 msgid "Push in Direction..."
 msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:3307
+#: src/bin/e_actions.c:3305
 msgid "Drag Icon..."
 msgstr "拖动图标..."
 
-#: src/bin/e_actions.c:3312 src/bin/e_actions.c:3314 src/bin/e_actions.c:3316
-#: src/bin/e_actions.c:3322 src/bin/e_actions.c:3328 src/bin/e_actions.c:3330
+#: src/bin/e_actions.c:3310 src/bin/e_actions.c:3312 src/bin/e_actions.c:3314
+#: src/bin/e_actions.c:3320 src/bin/e_actions.c:3326 src/bin/e_actions.c:3328
 msgid "Window : Moving"
 msgstr "窗口：移动"
 
-#: src/bin/e_actions.c:3312
+#: src/bin/e_actions.c:3310
 msgid "To Next Desktop"
 msgstr "到下一个桌面"
 
-#: src/bin/e_actions.c:3314
+#: src/bin/e_actions.c:3312
 msgid "To Previous Desktop"
 msgstr "到前一桌面"
 
-#: src/bin/e_actions.c:3316
+#: src/bin/e_actions.c:3314
 msgid "By Desktop #..."
 msgstr "按桌面号 #..."
 
-#: src/bin/e_actions.c:3322
+#: src/bin/e_actions.c:3320
 msgid "To Desktop..."
 msgstr "到桌面..."
 
-#: src/bin/e_actions.c:3328
+#: src/bin/e_actions.c:3326
 msgid "To Next Screen"
 msgstr "到下一屏幕"
 
-#: src/bin/e_actions.c:3330
+#: src/bin/e_actions.c:3328
 msgid "To Previous Screen"
 msgstr "到前一屏幕"
 
-#: src/bin/e_actions.c:3335
+#: src/bin/e_actions.c:3333
 msgid "Show Main Menu"
 msgstr "显示主窗口"
 
-#: src/bin/e_actions.c:3337
+#: src/bin/e_actions.c:3335
 msgid "Show Favorites Menu"
 msgstr "显示收藏菜单"
 
-#: src/bin/e_actions.c:3339
+#: src/bin/e_actions.c:3337
 msgid "Show All Applications Menu"
 msgstr "显示所有应用程序菜单"
 
-#: src/bin/e_actions.c:3341
+#: src/bin/e_actions.c:3339
 msgid "Show Clients Menu"
 msgstr "显示 客户端 菜单"
 
-#: src/bin/e_actions.c:3343
+#: src/bin/e_actions.c:3341
 msgid "Show Menu..."
 msgstr "显示菜单..."
 
-#: src/bin/e_actions.c:3350 src/bin/e_actions.c:3355 src/bin/e_actions.c:3360
+#: src/bin/e_actions.c:3348 src/bin/e_actions.c:3353 src/bin/e_actions.c:3358
+#: src/modules/conf/e_mod_main.c:277 src/modules/conf2/e_mod_main.c:310
+#: src/modules/conf2/e_mod_main.c:368
 #: src/modules/everything/evry_plug_apps.c:1169
 #: src/modules/fileman/e_mod_main.c:59
 msgid "Launch"
 msgstr "启动"
 
-#: src/bin/e_actions.c:3350 src/bin/e_int_border_prop.c:468
+#: src/bin/e_actions.c:3348 src/bin/e_int_border_prop.c:468
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:3355 src/bin/e_desktop_editor.c:694
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:694
+#: src/bin/e_int_border_menu.c:117
 #, c-format
 msgid "Application"
 msgstr "应用程序"
 
-#: src/bin/e_actions.c:3360
+#: src/bin/e_actions.c:3358
 msgid "New Instance of Focused App"
 msgstr ""
 
-#: src/bin/e_actions.c:3364 src/bin/e_int_menus.c:248
+#: src/bin/e_actions.c:3362 src/bin/e_int_menus.c:248
 msgid "Restart"
 msgstr "重启"
 
-#: src/bin/e_actions.c:3372
+#: src/bin/e_actions.c:3370
 msgid "Exit Now"
 msgstr "现在退出"
 
-#: src/bin/e_actions.c:3376 src/bin/e_actions.c:3381
+#: src/bin/e_actions.c:3374 src/bin/e_actions.c:3379
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment：模式"
 
-#: src/bin/e_actions.c:3377
+#: src/bin/e_actions.c:3375
 msgid "Presentation Mode Toggle"
 msgstr "锁定演示模式"
 
-#: src/bin/e_actions.c:3382
+#: src/bin/e_actions.c:3380
 msgid "Offline Mode Toggle"
 msgstr "锁定脱机模式"
 
-#: src/bin/e_actions.c:3386 src/bin/e_actions.c:3390 src/bin/e_actions.c:3394
+#: src/bin/e_actions.c:3384 src/bin/e_actions.c:3388 src/bin/e_actions.c:3392
 msgid "Enlightenment : Module"
 msgstr "Enlightenment：模块"
 
-#: src/bin/e_actions.c:3387
+#: src/bin/e_actions.c:3385
 msgid "Enable the named module"
 msgstr ""
 
-#: src/bin/e_actions.c:3391
+#: src/bin/e_actions.c:3389
 msgid "Disable the named module"
 msgstr ""
 
-#: src/bin/e_actions.c:3395
+#: src/bin/e_actions.c:3393
 msgid "Toggle the named module"
 msgstr ""
 
-#: src/bin/e_actions.c:3399 src/bin/e_actions.c:3403 src/bin/e_actions.c:3407
-#: src/bin/e_actions.c:3411 src/bin/e_actions.c:3415 src/bin/e_actions.c:3419
-#: src/bin/e_actions.c:3423 src/bin/e_actions.c:3427 src/bin/e_configure.c:411
+#: src/bin/e_actions.c:3397 src/bin/e_actions.c:3401 src/bin/e_actions.c:3405
+#: src/bin/e_actions.c:3409 src/bin/e_actions.c:3413 src/bin/e_actions.c:3417
+#: src/bin/e_actions.c:3421 src/bin/e_actions.c:3425 src/bin/e_configure.c:411
 #: src/bin/e_int_config_modules.c:52
 #: src/modules/conf_applications/e_int_config_apps.c:278
 #: src/modules/conf_display/e_int_config_desklock_fsel.c:87
 #: src/modules/conf_intl/e_int_config_imc.c:808
-#: src/modules/conf_theme/e_int_config_wallpaper.c:427
-#: src/modules/conf_theme/e_int_config_wallpaper.c:581
 #: src/modules/conf_theme/e_int_config_startup.c:273
 #: src/modules/conf_theme/e_int_config_theme.c:732
 #: src/modules/conf_theme/e_int_config_theme.c:1106
 #: src/modules/conf_theme/e_int_config_theme.c:1120
+#: src/modules/conf_theme/e_int_config_wallpaper.c:427
+#: src/modules/conf_theme/e_int_config_wallpaper.c:581
 #: src/modules/gadman/e_mod_config.c:252 src/modules/syscon/e_mod_main.c:31
 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:129
 msgid "System"
 msgstr "系统"
 
-#: src/bin/e_actions.c:3399
+#: src/bin/e_actions.c:3397
 msgid "Log Out"
 msgstr "注销"
 
-#: src/bin/e_actions.c:3403
+#: src/bin/e_actions.c:3401
 msgid "Power Off Now"
 msgstr "立即关机"
 
-#: src/bin/e_actions.c:3407
+#: src/bin/e_actions.c:3405
 msgid "Power Off"
 msgstr "关机"
 
-#: src/bin/e_actions.c:3415
+#: src/bin/e_actions.c:3413
 msgid "Suspend Now"
 msgstr "立即挂起"
 
-#: src/bin/e_actions.c:3427
+#: src/bin/e_actions.c:3425
 msgid "Hibernate Now"
 msgstr "立即休眠"
 
-#: src/bin/e_actions.c:3435
+#: src/bin/e_actions.c:3433
 msgid "Lock"
 msgstr "锁定"
 
-#: src/bin/e_actions.c:3440 src/bin/e_int_menus.c:1443
+#: src/bin/e_actions.c:3438 src/bin/e_int_menus.c:1443
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
-#: src/bin/e_actions.c:3445
+#: src/bin/e_actions.c:3443
 msgid "Generic : Actions"
 msgstr "常规：动作"
 
-#: src/bin/e_actions.c:3445
+#: src/bin/e_actions.c:3443
 msgid "Delayed Action"
 msgstr "延迟动作"
 
-#: src/bin/e_actions.c:3453 src/bin/e_actions.c:3457 src/bin/e_actions.c:3461
+#: src/bin/e_actions.c:3451 src/bin/e_actions.c:3455 src/bin/e_actions.c:3459
 msgid "Keyboard Layouts"
 msgstr "键盘布局"
 
-#: src/bin/e_actions.c:3454
+#: src/bin/e_actions.c:3452
 msgid "Use keyboard layout"
 msgstr "使用键盘布局"
 
-#: src/bin/e_actions.c:3458
+#: src/bin/e_actions.c:3456
 msgid "Next keyboard layout"
 msgstr "下一个键盘布局"
 
-#: src/bin/e_actions.c:3462
+#: src/bin/e_actions.c:3460
 msgid "Previous keyboard layout"
 msgstr "上一个键盘布局"
 
@@ -798,21 +802,430 @@ msgstr "选择"
 
 #: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:858
 #: src/bin/e_desktop_editor.c:921 src/bin/e_entry_dialog.c:64
-#: src/bin/e_fm.c:9993 src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
-#: src/bin/e_import_config_dialog.c:540
+#: src/bin/e_fm.c:10014 src/bin/e_fm_prop.c:625
+#: src/bin/e_import_config_dialog.c:534 src/bin/e_import_dialog.c:195
+#: src/modules/bluez4/agent.c:136 src/modules/bluez4/agent.c:148
 #: src/modules/conf_bindings/e_int_config_signalbindings.c:624
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
-#: src/modules/syscon/e_syscon.c:98
 #: src/modules/quickaccess/e_mod_quickaccess.c:319
 #: src/modules/quickaccess/e_mod_quickaccess.c:381
 #: src/modules/shot/e_mod_main.c:290 src/modules/shot/e_mod_main.c:541
-#: src/modules/shot/e_mod_main.c:567 src/modules/shot/e_mod_main.c:802
-#: src/modules/xkbswitch/e_mod_config.c:499
+#: src/modules/shot/e_mod_main.c:567 src/modules/shot/e_mod_main.c:799
+#: src/modules/syscon/e_syscon.c:98 src/modules/xkbswitch/e_mod_config.c:499
 msgid "Cancel"
 msgstr "取消"
 
+#: src/bin/e_comp.c:4077
+msgid "Compositor Warning"
+msgstr "合成器告警"
+
+#: src/bin/e_comp.c:4077
+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/bin/e_comp.c:4096 src/bin/e_comp.c:4118
+msgid "Compositor Error"
+msgstr "合成器错误"
+
+#: src/bin/e_comp.c:4096
+msgid "Another compositor is already running<br>on your display server."
+msgstr "已有其他和称其运行在您的显示服务器上。。"
+
+#: src/bin/e_comp.c:4118
+msgid ""
+"Your display server does not support the<br>compositor overlay window. This "
+"is needed<br>for it to function."
+msgstr "您的显示服务器不支持合成器覆盖窗口。<br>合成器必须此功能方可正常工作。"
+
+#: src/bin/e_comp.c:4454 src/modules/bluez4/e_mod_main.c:210
+#: src/modules/conf_comp/e_mod_main.c:55
+msgid "Visible"
+msgstr "可见"
+
+#: src/bin/e_comp.c:4459 src/modules/conf_comp/e_mod_main.c:60
+msgid "Focus-Out"
+msgstr "失焦"
+
+#: src/bin/e_comp.c:4464 src/modules/conf_comp/e_mod_main.c:65
+msgid "Focus-In"
+msgstr "聚焦"
+
+#: src/bin/e_comp.c:4469 src/bin/e_int_border_prop.c:510
+#: src/modules/conf_comp/e_mod_main.c:70
+msgid "Hidden"
+msgstr "隐藏"
+
+#: src/bin/e_comp.c:4518 src/bin/e_int_border_prop.c:444
+#: src/bin/e_int_border_remember.c:698 src/modules/conf_comp/e_mod_main.c:177
+#: src/modules/wizard/page_050.c:95
+msgid "Title"
+msgstr "标题"
+
+#: src/bin/e_comp.c:4601
+#, fuzzy
+msgid "Use fast composite effects for windows"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4601 src/bin/e_comp.c:4603 src/bin/e_comp.c:4605
+#: src/bin/e_comp.c:4607 src/bin/e_comp.c:4609 src/bin/e_comp.c:4612
+#: src/bin/e_comp.c:4614 src/bin/e_comp.c:4616 src/bin/e_comp.c:4618
+#: src/bin/e_comp.c:4620 src/bin/e_comp.c:4622 src/bin/e_comp.c:4626
+#: src/bin/e_comp.c:4630 src/bin/e_comp.c:4635 src/bin/e_comp.c:4638
+#: src/bin/e_comp.c:4641 src/bin/e_comp.c:4644 src/bin/e_comp.c:4647
+#: src/bin/e_comp.c:4654 src/bin/e_comp.c:4657 src/bin/e_comp.c:4664
+#: src/bin/e_comp.c:4672 src/bin/e_comp.c:4674 src/bin/e_comp.c:4676
+#: src/bin/e_comp.c:4679 src/bin/e_comp.c:4681 src/bin/e_comp.c:4684
+#: src/bin/e_comp.c:4688 src/bin/e_comp.c:4689 src/bin/e_comp.c:4690
+#: src/bin/e_comp.c:4916 src/bin/e_comp.c:4917
+#: src/modules/conf_comp/e_mod_main.c:259
+#, fuzzy
+msgid "composite"
+msgstr "混成"
+
+#: src/bin/e_comp.c:4601 src/bin/e_comp.c:4612 src/bin/e_comp.c:4626
+#: src/bin/e_comp.c:4630 src/bin/e_comp.c:4635 src/bin/e_comp.c:4638
+#: src/bin/e_comp.c:4641 src/bin/e_comp.c:4644 src/bin/e_comp.c:4647
+#: src/bin/e_comp.c:4654 src/bin/e_comp.c:4657 src/bin/e_comp.c:4664
+#: src/bin/e_comp.c:4672 src/bin/e_comp.c:4674 src/bin/e_comp.c:4676
+#: src/bin/e_comp.c:4679 src/bin/e_comp.c:4681 src/bin/e_comp.c:4684
+#: src/bin/e_configure_option.c:1506 src/bin/e_configure_option.c:1507
+#: src/bin/e_configure_option.c:1510 src/bin/e_configure_option.c:1543
+#: src/bin/e_configure_option.c:1562 src/bin/e_configure_option.c:1566
+#: src/bin/e_configure_option.c:1567 src/bin/e_configure_option.c:1569
+#: src/bin/e_configure_option.c:1572 src/bin/e_configure_option.c:1575
+#: src/bin/e_configure_option.c:1577 src/bin/e_configure_option.c:1580
+#: src/bin/e_configure_option.c:1581 src/bin/e_configure_option.c:1582
+#: src/bin/e_configure_option.c:1583 src/bin/e_configure_option.c:1585
+#: src/bin/e_configure_option.c:1586 src/bin/e_configure_option.c:1587
+#: src/bin/e_configure_option.c:1588 src/bin/e_configure_option.c:1589
+#: src/bin/e_configure_option.c:1591 src/bin/e_configure_option.c:1592
+#: src/bin/e_configure_option.c:1597 src/bin/e_configure_option.c:1598
+#: src/bin/e_configure_option.c:1600 src/bin/e_configure_option.c:1605
+#: src/bin/e_configure_option.c:1608 src/bin/e_configure_option.c:1611
+#: src/bin/e_configure_option.c:1612 src/bin/e_configure_option.c:1613
+#: src/bin/e_configure_option.c:1615 src/bin/e_configure_option.c:1616
+#: src/bin/e_configure_option.c:1618 src/bin/e_configure_option.c:1619
+#: src/bin/e_configure_option.c:1620 src/bin/e_configure_option.c:1621
+#: src/bin/e_configure_option.c:1622 src/bin/e_configure_option.c:1623
+#: src/bin/e_configure_option.c:1624 src/bin/e_configure_option.c:1625
+#: src/bin/e_configure_option.c:1626 src/bin/e_configure_option.c:1627
+#: src/bin/e_configure_option.c:1629 src/bin/e_configure_option.c:1631
+#: src/bin/e_configure_option.c:1633 src/bin/e_configure_option.c:1635
+#: src/bin/e_configure_option.c:1637 src/bin/e_configure_option.c:1639
+#: src/bin/e_configure_option.c:1641 src/bin/e_configure_option.c:1647
+#: src/bin/e_configure_option.c:1650 src/bin/e_configure_option.c:1651
+#: src/bin/e_configure_option.c:1653 src/bin/e_configure_option.c:1655
+#: src/bin/e_configure_option.c:1656 src/bin/e_configure_option.c:1657
+#: src/bin/e_configure_option.c:1659 src/bin/e_configure_option.c:1660
+#: src/bin/e_configure_option.c:1667 src/bin/e_configure_option.c:1669
+#: src/bin/e_configure_option.c:1671 src/bin/e_configure_option.c:1674
+#: src/bin/e_configure_option.c:1675 src/bin/e_configure_option.c:1676
+#: src/bin/e_configure_option.c:1677 src/bin/e_configure_option.c:1685
+#: src/bin/e_configure_option.c:1686 src/bin/e_configure_option.c:1687
+#: src/bin/e_configure_option.c:1688 src/bin/e_configure_option.c:1689
+#: src/bin/e_configure_option.c:1690 src/bin/e_configure_option.c:1691
+#: src/bin/e_configure_option.c:1710 src/bin/e_configure_option.c:1722
+#: src/bin/e_configure_option.c:1724 src/bin/e_configure_option.c:1787
+#: src/bin/e_configure_option.c:1790 src/bin/e_configure_option.c:1791
+#: src/bin/e_configure_option.c:1794 src/bin/e_configure_option.c:1797
+#: src/bin/e_configure_option.c:1800 src/bin/e_configure_option.c:1801
+#: src/bin/e_configure_option.c:1802 src/bin/e_configure_option.c:1835
+#: src/bin/e_configure_option.c:1840 src/bin/e_configure_option.c:1872
+#: src/bin/e_configure_option.c:1874 src/bin/e_configure_option.c:1876
+#: src/bin/e_configure_option.c:1878 src/bin/e_configure_option.c:1880
+#: src/bin/e_configure_option.c:2013 src/bin/e_configure_option.c:2031
+#: src/bin/e_configure_option.c:2063 src/modules/conf_comp/e_mod_main.c:259
+#: src/modules/conf_window_remembers/e_mod_main.c:28
+#: src/modules/fileman/e_mod_main.c:399
+#: src/modules/quickaccess/e_mod_main.c:68
+#: src/modules/quickaccess/e_mod_main.c:71
+#: src/modules/quickaccess/e_mod_main.c:74
+#: src/modules/quickaccess/e_mod_main.c:76
+#: src/modules/quickaccess/e_mod_main.c:78
+#: src/modules/tiling/e_mod_tiling.c:3916
+#: src/modules/tiling/e_mod_tiling.c:3921
+#: src/modules/tiling/e_mod_tiling.c:3923
+#: src/modules/tiling/e_mod_tiling.c:4057
+#, fuzzy
+msgid "border"
+msgstr "边框"
+
+#: src/bin/e_comp.c:4601 src/bin/e_comp.c:4603 src/bin/e_comp.c:4605
+#: src/bin/e_comp.c:4607 src/bin/e_comp.c:4609 src/bin/e_comp.c:4612
+#: src/bin/e_comp.c:4614 src/bin/e_comp.c:4616 src/bin/e_comp.c:4618
+#: src/bin/e_comp.c:4620 src/bin/e_comp.c:4622 src/bin/e_comp.c:4630
+#: src/bin/e_configure_option.c:1464 src/bin/e_configure_option.c:1468
+#: src/bin/e_configure_option.c:1472 src/bin/e_configure_option.c:1476
+#: src/bin/e_configure_option.c:1805 src/bin/e_configure_option.c:1807
+#: src/bin/e_configure_option.c:1835 src/bin/e_configure_option.c:1945
+#: src/bin/e_configure_option.c:1947 src/bin/e_configure_option.c:1949
+#: src/bin/e_configure_option.c:1955 src/bin/e_configure_option.c:1957
+#: src/bin/e_configure_option.c:1963 src/bin/e_configure_option.c:2066
+#: src/modules/conf_theme/e_mod_main.c:168
+#: src/modules/conf_theme/e_mod_main.c:176
+#, fuzzy
+msgid "theme"
+msgstr "主题"
+
+#: src/bin/e_comp.c:4601 src/bin/e_comp.c:4603 src/bin/e_comp.c:4605
+#: src/bin/e_comp.c:4607 src/bin/e_comp.c:4609 src/bin/e_comp.c:4612
+#: src/bin/e_comp.c:4614 src/bin/e_comp.c:4616 src/bin/e_comp.c:4618
+#: src/bin/e_comp.c:4620 src/bin/e_comp.c:4622
+#: src/bin/e_configure_option.c:1464 src/bin/e_configure_option.c:1468
+#: src/bin/e_configure_option.c:1472 src/bin/e_configure_option.c:1476
+#: src/bin/e_configure_option.c:1506 src/bin/e_configure_option.c:1507
+#: src/bin/e_configure_option.c:1510 src/bin/e_configure_option.c:1514
+#: src/bin/e_configure_option.c:1615 src/bin/e_configure_option.c:1616
+#: src/bin/e_configure_option.c:1812 src/bin/e_configure_option.c:1830
+#: src/bin/e_configure_option.c:1915
+#, fuzzy
+msgid "animate"
+msgstr "动画"
+
+#: src/bin/e_comp.c:4603
+#, fuzzy
+msgid "Use fast composite effects for menus"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4603 src/bin/e_comp.c:4614
+#: src/bin/e_configure_option.c:1490 src/bin/e_configure_option.c:1493
+#: src/bin/e_configure_option.c:1496 src/bin/e_configure_option.c:1499
+#: src/bin/e_configure_option.c:1502 src/bin/e_configure_option.c:1693
+#: src/bin/e_configure_option.c:1694 src/bin/e_configure_option.c:1696
+#: src/bin/e_configure_option.c:1698 src/bin/e_configure_option.c:1701
+#: src/bin/e_configure_option.c:1702 src/bin/e_configure_option.c:1704
+#: src/bin/e_configure_option.c:1787 src/bin/e_configure_option.c:1790
+#: src/bin/e_configure_option.c:1791 src/bin/e_configure_option.c:1794
+#: src/bin/e_configure_option.c:1797 src/bin/e_configure_option.c:1800
+#: src/bin/e_configure_option.c:1801 src/bin/e_configure_option.c:1802
+#: src/bin/e_configure_option.c:2044
+msgid "menu"
+msgstr ""
+
+#: src/bin/e_comp.c:4605
+#, fuzzy
+msgid "Use fast composite effects for popups"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4605 src/bin/e_comp.c:4616
+#, fuzzy
+msgid "popup"
+msgstr "弹出"
+
+#: src/bin/e_comp.c:4607
+#, fuzzy
+msgid "Use fast composite effects for objects"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4609
+#, fuzzy
+msgid ""
+"Use fast composite effects for override-redirect windows (tooltips and such)"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4612 src/modules/conf_comp/e_mod_config.c:226
+#, fuzzy
+msgid "Disable composite effects for windows"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4614 src/modules/conf_comp/e_mod_config.c:229
+msgid "Disable composite effects for menus"
+msgstr ""
+
+#: src/bin/e_comp.c:4616 src/modules/conf_comp/e_mod_config.c:232
+msgid "Disable composite effects for popups"
+msgstr ""
+
+#: src/bin/e_comp.c:4618 src/modules/conf_comp/e_mod_config.c:235
+#, fuzzy
+msgid "Disable composite effects for objects"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4620
+#, fuzzy
+msgid ""
+"Disable composite effects for override-redirect windows (tooltips and such)"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4622
+#, fuzzy
+msgid "Disable composite effects for the screen"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4622 src/bin/e_configure_option.c:1537
+#: src/bin/e_configure_option.c:1539 src/bin/e_configure_option.c:1598
+#: src/bin/e_configure_option.c:1620 src/bin/e_configure_option.c:1622
+#: src/bin/e_configure_option.c:1739 src/bin/e_configure_option.c:1790
+#: src/bin/e_configure_option.c:1828 src/bin/e_configure_option.c:1840
+#: src/bin/e_configure_option.c:2024 src/bin/e_configure_option.c:2025
+#: src/bin/e_configure_option.c:2026 src/bin/e_configure_option.c:2027
+#: src/bin/e_configure_option.c:2028 src/bin/e_configure_option.c:2029
+#: src/modules/conf_bindings/e_mod_main.c:60
+#: src/modules/conf_randr/e_mod_main.c:31
+#: src/modules/notification/e_mod_main.c:267
+#: src/modules/notification/e_mod_main.c:270
+#: src/modules/notification/e_mod_main.c:274
+#: src/modules/notification/e_mod_main.c:299
+#, fuzzy
+msgid "screen"
+msgstr "屏幕"
+
+#: src/bin/e_comp.c:4623
+msgid ""
+"This option disables composite effects from themes, such as animating the "
+"screen fade when blanking"
+msgstr ""
+
+#: src/bin/e_comp.c:4626
+#, fuzzy
+msgid "Compositing engine"
+msgstr "混成"
+
+#: src/bin/e_comp.c:4630
+msgid "Default window composite effect"
+msgstr ""
+
+#: src/bin/e_comp.c:4635
+#, fuzzy
+msgid "Smooth scaling of composited window content"
+msgstr "窗口内容平滑缩放"
+
+#: src/bin/e_comp.c:4638
+#, fuzzy
+msgid "Sync composited windows"
+msgstr "同步窗口"
+
+#: src/bin/e_comp.c:4641
+#, fuzzy
+msgid "Loose sync composited windows"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4644
+msgid "Grab server during rendering of composited windows"
+msgstr ""
+
+#: src/bin/e_comp.c:4647
+msgid "Initial draw timeout for newly-mapped composited windows"
+msgstr ""
+
+#: src/bin/e_comp.c:4647 src/bin/e_configure_option.c:1496
+#: src/bin/e_configure_option.c:1533 src/bin/e_configure_option.c:1548
+#: src/bin/e_configure_option.c:1583 src/bin/e_configure_option.c:1657
+#: src/bin/e_configure_option.c:1659 src/bin/e_configure_option.c:1660
+#: src/bin/e_configure_option.c:1744 src/bin/e_configure_option.c:1745
+#: src/bin/e_configure_option.c:1747 src/bin/e_configure_option.c:1748
+#: src/bin/e_configure_option.c:1751 src/bin/e_configure_option.c:1752
+#: src/bin/e_configure_option.c:1756 src/bin/e_configure_option.c:1764
+#: src/bin/e_configure_option.c:1771 src/bin/e_configure_option.c:1872
+#: src/bin/e_configure_option.c:1904 src/bin/e_configure_option.c:1920
+#: src/modules/fileman/e_mod_main.c:442
+#: src/modules/notification/e_mod_main.c:264
+#: src/modules/notification/e_mod_main.c:265
+msgid "delay"
+msgstr ""
+
+#: src/bin/e_comp.c:4648
+#, fuzzy, c-format
+msgid "%1.2f seconds"
+msgstr "%.2f 秒"
+
+#: src/bin/e_comp.c:4654
+#, fuzzy
+msgid "Tear-free compositing (VSYNC)"
+msgstr "Tear-free 更新(VSynced)"
+
+#: src/bin/e_comp.c:4657
+#, fuzzy
+msgid "Texture from pixmap rendering for composite"
+msgstr "使用位图纹理"
+
+#: src/bin/e_comp.c:4664
+#, fuzzy
+msgid "Composite swapping method"
+msgstr "默认交换方法："
+
+#: src/bin/e_comp.c:4672 src/modules/conf_comp/e_mod_config.c:314
+#: src/modules/conf_comp/e_mod_config.c:549
+msgid "Don't composite fullscreen windows"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_comp.c:4674
+msgid "Send flush when compositing windows"
+msgstr ""
+
+#: src/bin/e_comp.c:4676
+msgid "Send dump when compositing windows"
+msgstr ""
+
+#: src/bin/e_comp.c:4679
+msgid "Show framerate when compositing windows"
+msgstr ""
+
+#: src/bin/e_comp.c:4681
+msgid "Rolling average for fps display when compositing"
+msgstr ""
+
+#: src/bin/e_comp.c:4682
+#, fuzzy, c-format
+msgid "%1.0f frames"
+msgstr "%1.0f 帧"
+
+#: src/bin/e_comp.c:4684
+msgid "Composite framerate display corner"
+msgstr ""
+
+#: src/bin/e_comp.c:4688 src/bin/e_comp.c:4917
+#: src/bin/e_configure_option.c:2031 src/bin/e_configure_option.c:2032
+#: src/bin/e_configure_option.c:2033 src/bin/e_configure_option.c:2034
+#: src/bin/e_configure_option.c:2035 src/bin/e_configure_option.c:2036
+#: src/bin/e_configure_option.c:2037 src/bin/e_configure_option.c:2038
+#: src/bin/e_configure_option.c:2039 src/bin/e_configure_option.c:2040
+#: src/bin/e_configure_option.c:2041 src/bin/e_configure_option.c:2042
+#: src/modules/quickaccess/e_mod_main.c:81
+#: src/modules/quickaccess/e_mod_main.c:102
+#: src/modules/tiling/e_mod_tiling.c:3929
+#, fuzzy
+msgid "windows"
+msgstr "窗口"
+
+#: src/bin/e_comp.c:4772
+#, fuzzy
+msgid ""
+"Your display server does not support XComposite, or Ecore-X was built "
+"without XComposite support. Note that for composite support you will also "
+"need XRender and XFixes support in X11 and Ecore."
+msgstr ""
+"您的显示服务器不支持 DComposite<br>或 Ecore 编译时为开启 XComposite 支持。"
+"<br>请注意为支持混成，您还需要在<br>X11 和 Ecore 中开启 XRender 和 XFixes 支"
+"持。"
+
+#: src/bin/e_comp.c:4781
+#, fuzzy
+msgid ""
+"Your display server does not support XDamage or Ecore was built without "
+"XDamage support."
+msgstr "您的显示服务器不支持 XDamage<br>或 Ecore 编译时未开启 XDamage 支持。"
+
+#: src/bin/e_comp.c:4864 src/bin/e_comp.c:4870
+#, fuzzy
+msgid "Compositor"
+msgstr "混成"
+
+#: src/bin/e_comp.c:4865
+msgid "Change current window opacity"
+msgstr ""
+
+#: src/bin/e_comp.c:4871
+msgid "Set current window opacity"
+msgstr ""
+
 #: src/bin/e_config.c:972
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -847,11 +1260,11 @@ msgid ""
 "the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1638 src/bin/e_config.c:2298
+#: src/bin/e_config.c:1653 src/bin/e_config.c:2314
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 写入设置出错"
 
-#: src/bin/e_config.c:1641
+#: src/bin/e_config.c:1656
 #, c-format
 msgid ""
 "Enlightenment has had an error while moving config files<br>from:<br>"
@@ -861,17 +1274,19 @@ msgstr ""
 "Enlightenment 在将 <br>%s<br><br> 的配置文件移动至 <br>%s<br><br> 时出错，其"
 "他写操作已安全中止。<br>"
 
-#: src/bin/e_config.c:1651 src/bin/e_config.c:2311
+#: src/bin/e_config.c:1666 src/bin/e_config.c:2327
 #: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:856
 #: src/bin/e_desktop_editor.c:919 src/bin/e_entry_dialog.c:63
-#: src/bin/e_exec.c:615 src/bin/e_fm.c:9992 src/bin/e_fm.c:10723
-#: src/bin/e_fm_prop.c:624 src/bin/e_import_config_dialog.c:539
+#: src/bin/e_exec.c:615 src/bin/e_fm.c:10013 src/bin/e_fm.c:10744
+#: src/bin/e_fm_prop.c:624 src/bin/e_import_config_dialog.c:533
 #: src/bin/e_int_border_remember.c:353 src/bin/e_int_border_remember.c:548
 #: src/bin/e_module.c:588 src/bin/e_module.c:994 src/bin/e_sys.c:619
-#: src/bin/e_sys.c:660 src/bin/e_utils.c:693
+#: src/bin/e_sys.c:660 src/bin/e_utils.c:693 src/modules/bluez4/agent.c:71
+#: src/modules/bluez4/agent.c:136 src/modules/bluez4/agent.c:148
 #: src/modules/conf_bindings/e_int_config_signalbindings.c:623
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1189
 #: src/modules/cpufreq/e_mod_main.c:439 src/modules/cpufreq/e_mod_main.c:468
 #: src/modules/cpufreq/e_mod_main.c:495
 #: src/modules/fileman/e_int_config_mime_edit.c:315
@@ -879,91 +1294,91 @@ msgstr ""
 msgid "OK"
 msgstr "确定"
 
-#: src/bin/e_config.c:2189
+#: src/bin/e_config.c:2205
 msgid "Settings Upgraded"
 msgstr "设置已经升级"
 
-#: src/bin/e_config.c:2207
+#: src/bin/e_config.c:2223
 msgid "The EET file handle is bad."
 msgstr "EET 文件句柄非法。"
 
-#: src/bin/e_config.c:2211
+#: src/bin/e_config.c:2227
 msgid "The file data is empty."
 msgstr "该文件数据为空。"
 
-#: src/bin/e_config.c:2215
+#: src/bin/e_config.c:2231
 msgid ""
 "The file is not writable. Perhaps the disk is read-only<br>or you lost "
 "permissions to your files."
 msgstr "文件不可写，原因可能是磁盘为只读或者您失去了操作权限。"
 
-#: src/bin/e_config.c:2219
+#: src/bin/e_config.c:2235
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr "准备写入时内存不足。<br>请释放内存。"
 
-#: src/bin/e_config.c:2223
+#: src/bin/e_config.c:2239
 msgid "This is a generic error."
 msgstr "这是个一般性错误。"
 
-#: src/bin/e_config.c:2227
+#: src/bin/e_config.c:2243
 msgid ""
 "The settings file is too large.<br>It should be very small (a few hundred KB "
 "at most)."
 msgstr "设置文件太大了。<br>它应该很小的（最多几百 KB)。"
 
-#: src/bin/e_config.c:2231
+#: src/bin/e_config.c:2247
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr "磁盘有 I/O 错误。<br> 可能需要更换磁盘？"
 
-#: src/bin/e_config.c:2235
+#: src/bin/e_config.c:2251
 msgid "You ran out of space while writing the file."
 msgstr "写文件时空间已满。"
 
-#: src/bin/e_config.c:2239
+#: src/bin/e_config.c:2255
 msgid "The file was closed while writing."
 msgstr "写入文件时文件已关闭。"
 
-#: src/bin/e_config.c:2243
+#: src/bin/e_config.c:2259
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "内存映射(mmap)该文件出错。"
 
-#: src/bin/e_config.c:2247
+#: src/bin/e_config.c:2263
 msgid "X509 Encoding failed."
 msgstr "X509 编码失败。"
 
-#: src/bin/e_config.c:2251
+#: src/bin/e_config.c:2267
 msgid "Signature failed."
 msgstr "签名失败。"
 
-#: src/bin/e_config.c:2255
+#: src/bin/e_config.c:2271
 msgid "The signature was invalid."
 msgstr "签名无效。"
 
-#: src/bin/e_config.c:2259
+#: src/bin/e_config.c:2275
 msgid "Not signed."
 msgstr "未签名。"
 
-#: src/bin/e_config.c:2263
+#: src/bin/e_config.c:2279
 msgid "Feature not implemented."
 msgstr "特性未实现。"
 
-#: src/bin/e_config.c:2267
+#: src/bin/e_config.c:2283
 msgid "PRNG was not seeded."
 msgstr "PRNG 未初始化。"
 
-#: src/bin/e_config.c:2271
+#: src/bin/e_config.c:2287
 msgid "Encryption failed."
 msgstr "加密失败。"
 
-#: src/bin/e_config.c:2275
+#: src/bin/e_config.c:2291
 msgid "Decryption failed."
 msgstr "解密失败。"
 
-#: src/bin/e_config.c:2279
+#: src/bin/e_config.c:2295
 msgid "The error is unknown to Enlightenment."
 msgstr "Enlightenment 未知错误。"
 
-#: src/bin/e_config.c:2301
+#: src/bin/e_config.c:2317
 #, c-format
 msgid ""
 "Enlightenment has had an error while writing<br>its config file.<br>"
@@ -972,7 +1387,7 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_bindings/e_mod_main.c:37
+#: src/modules/conf/e_mod_main.c:288 src/modules/conf_bindings/e_mod_main.c:37
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -983,15 +1398,16 @@ msgstr "高级"
 msgid "Basic"
 msgstr "基本"
 
-#: src/bin/e_config_dialog.c:280
+#: src/bin/e_config_dialog.c:280 src/modules/conf2/e_conf2.c:1279
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:867
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1195
 msgid "Apply"
 msgstr "应用"
 
 #: src/bin/e_configure.c:29 src/modules/conf_shelves/e_mod_main.c:21
-#: src/modules/gadman/e_mod_main.c:23 src/modules/mixer/e_mod_main.c:1248
-#: src/modules/connman/e_mod_main.c:591
-#: src/modules/notification/e_mod_main.c:181
+#: src/modules/connman/e_mod_main.c:591 src/modules/gadman/e_mod_main.c:23
+#: src/modules/mixer/e_mod_main.c:1169
+#: src/modules/notification/e_mod_main.c:198
 msgid "Extensions"
 msgstr "扩展"
 
@@ -1007,6 +1423,1631 @@ msgstr "模块"
 msgid "Preferences"
 msgstr "首选项"
 
+#: src/bin/e_configure_option.c:574 src/bin/e_fm_prop.c:480
+#: src/bin/e_import_config_dialog.c:470 src/bin/e_widget_fsel.c:348
+#: src/modules/conf_theme/e_int_config_theme.c:1414
+#: src/modules/conf_theme/e_int_config_transitions.c:218
+#: src/modules/conf_theme/e_int_config_xsettings.c:439
+msgid "Preview"
+msgstr "预览"
+
+#: src/bin/e_configure_option.c:957
+msgid "none"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1074 src/bin/e_int_border_prop.c:298
+#: src/modules/clock/e_mod_config.c:103 src/modules/clock/e_mod_config.c:141
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_performance/e_int_config_powermanagement.c:196
+#: src/modules/conf_theme/e_int_config_fonts.c:689
+#: src/modules/conf_theme/e_int_config_transitions.c:199
+#: src/modules/conf_theme/e_int_config_transitions.c:257
+#: src/modules/conf_theme/e_int_config_transitions.c:289
+#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:116
+#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:129
+#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:143
+msgid "None"
+msgstr "无"
+
+#: src/bin/e_configure_option.c:1463
+#, fuzzy
+msgid "Show splash screen on startup"
+msgstr "登录时显示飞溅屏幕"
+
+#: src/bin/e_configure_option.c:1463 src/bin/e_configure_option.c:1464
+#: src/bin/e_configure_option.c:2011
+#, fuzzy
+msgid "splash"
+msgstr "Splash"
+
+#: src/bin/e_configure_option.c:1463 src/bin/e_configure_option.c:1464
+#: src/bin/e_configure_option.c:1468
+#: src/modules/conf_applications/e_mod_main.c:92
+#, fuzzy
+msgid "startup"
+msgstr "启动"
+
+#: src/bin/e_configure_option.c:1464
+#, fuzzy
+msgid "Startup splash theme"
+msgstr "启动应用程序"
+
+#: src/bin/e_configure_option.c:1468
+msgid "Startup transition effect"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1468 src/bin/e_configure_option.c:1472
+#: src/bin/e_configure_option.c:1476 src/bin/e_configure_option.c:2014
+#, fuzzy
+msgid "transition"
+msgstr "变换"
+
+#: src/bin/e_configure_option.c:1472
+msgid "Desk change transition effect"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1472 src/bin/e_configure_option.c:1537
+#: src/bin/e_configure_option.c:1539 src/bin/e_configure_option.c:1567
+#: src/bin/e_configure_option.c:1585 src/bin/e_configure_option.c:1598
+#: src/bin/e_configure_option.c:1619 src/bin/e_configure_option.c:1621
+#: src/bin/e_configure_option.c:1624 src/bin/e_configure_option.c:1690
+#: src/bin/e_configure_option.c:1800 src/bin/e_configure_option.c:1826
+#: src/bin/e_configure_option.c:1827 src/bin/e_configure_option.c:1828
+#: src/bin/e_configure_option.c:1830 src/bin/e_configure_option.c:2026
+#, fuzzy
+msgid "vdesk"
+msgstr "桌面"
+
+#: src/bin/e_configure_option.c:1476
+msgid "Wallpaper change transition effect"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1476 src/bin/e_configure_option.c:1481
+#: src/bin/e_configure_option.c:1750 src/bin/e_configure_option.c:2010
+#: src/modules/conf_theme/e_mod_main.c:172
+#, fuzzy
+msgid "wallpaper"
+msgstr "壁纸"
+
+#: src/bin/e_configure_option.c:1481
+#, fuzzy
+msgid "Default desktop wallpaper"
+msgstr "桌面壁纸"
+
+#: src/bin/e_configure_option.c:1485
+#, fuzzy
+msgid "Default desktop name"
+msgstr "桌面名称"
+
+#: src/bin/e_configure_option.c:1485 src/bin/e_configure_option.c:1537
+#: src/bin/e_configure_option.c:1539 src/bin/e_configure_option.c:1602
+#: src/bin/e_configure_option.c:1856 src/bin/e_configure_option.c:1860
+#: src/bin/e_configure_option.c:2027 src/modules/conf_shelves/e_mod_main.c:38
+#, fuzzy
+msgid "desktop"
+msgstr "桌面"
+
+#: src/bin/e_configure_option.c:1485 src/bin/e_configure_option.c:1949
+#, fuzzy
+msgid "name"
+msgstr "重命名"
+
+#: src/bin/e_configure_option.c:1486
+msgid "Used in Pager displays"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1490
+#, fuzzy
+msgid "Menu scroll speed"
+msgstr "菜单滚动速度"
+
+#: src/bin/e_configure_option.c:1490 src/bin/e_configure_option.c:1499
+#: src/bin/e_configure_option.c:1502 src/bin/e_configure_option.c:1848
+#: src/bin/e_configure_option.c:1849 src/bin/e_configure_option.c:1851
+#: src/bin/e_configure_option.c:1853
+#, fuzzy
+msgid "scroll"
+msgstr "自动滚动"
+
+#: src/bin/e_configure_option.c:1490 src/bin/e_configure_option.c:1493
+#: src/bin/e_configure_option.c:1510 src/bin/e_configure_option.c:1514
+#: src/bin/e_configure_option.c:1589 src/bin/e_configure_option.c:1616
+#: src/bin/e_configure_option.c:1822 src/bin/e_configure_option.c:1849
+#: src/bin/e_configure_option.c:1851 src/bin/e_configure_option.c:1915
+#, fuzzy
+msgid "speed"
+msgstr "回绕速度"
+
+#: src/bin/e_configure_option.c:1492
+msgid "Speed at which the menus move onto screen if offscreen"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1493
+#, fuzzy
+msgid "Menu fast move threshold"
+msgstr "快速移动鼠标临界值"
+
+#: src/bin/e_configure_option.c:1493 src/bin/e_configure_option.c:1591
+#: src/bin/e_configure_option.c:1674 src/bin/e_configure_option.c:1676
+#: src/bin/e_configure_option.c:1685 src/bin/e_configure_option.c:1874
+#: src/bin/e_configure_option.c:1876 src/bin/e_configure_option.c:2040
+#, fuzzy
+msgid "move"
+msgstr "删除"
+
+#: src/bin/e_configure_option.c:1495
+msgid ""
+"Moving the mouse faster than this speed over a menu causes menu items to not "
+"be selected"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1496
+msgid "Menu mouse deactivate delay"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1496 src/bin/e_configure_option.c:1541
+#: src/bin/e_configure_option.c:1594 src/bin/e_configure_option.c:1597
+#: src/bin/e_configure_option.c:1598 src/bin/e_configure_option.c:1600
+#: src/bin/e_configure_option.c:1602
+msgid "drag"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1498
+msgid ""
+"The minimum time before a menu can be closed by clicking the mouse outside "
+"the menu"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1499
+msgid "Menu autoscroll margin"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1501
+msgid ""
+"The distance from the edge of the screen before menus begin to move away "
+"from the edge"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1502
+msgid "Menu autoscroll cursor margin"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1502 src/bin/e_configure_option.c:1591
+#: src/bin/e_configure_option.c:1592 src/bin/e_configure_option.c:1814
+#: src/bin/e_configure_option.c:1822 src/bin/e_configure_option.c:2047
+#: src/modules/conf_bindings/e_mod_main.c:53
+#: src/modules/conf_bindings/e_mod_main.c:63
+#, fuzzy
+msgid "mouse"
+msgstr "鼠标"
+
+#: src/bin/e_configure_option.c:1502 src/bin/e_configure_option.c:1587
+#: src/bin/e_configure_option.c:1588 src/bin/e_configure_option.c:1589
+#: src/bin/e_configure_option.c:1591 src/bin/e_configure_option.c:1611
+#: src/bin/e_configure_option.c:1612 src/bin/e_configure_option.c:1613
+#: src/bin/e_configure_option.c:1805 src/bin/e_configure_option.c:1807
+#: src/bin/e_configure_option.c:1810 src/bin/e_configure_option.c:1812
+#: src/bin/e_configure_option.c:2048 src/bin/e_configure_option.c:2067
+#, fuzzy
+msgid "pointer"
+msgstr "指针"
+
+#: src/bin/e_configure_option.c:1504
+msgid ""
+"The distance of the mouse pointer from the edge of the screen before menus "
+"begin to move away from the edge"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1506
+msgid "Enable window shading animation"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1506 src/bin/e_configure_option.c:1507
+#: src/bin/e_configure_option.c:1510
+#, fuzzy
+msgid "shade"
+msgstr "卷起"
+
+#: src/bin/e_configure_option.c:1507
+msgid "Window shade animation type"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1510
+#, fuzzy
+msgid "Window shade animation speed"
+msgstr "动画速度"
+
+#: src/bin/e_configure_option.c:1514
+#: src/modules/conf_performance/e_int_config_performance.c:107
+msgid "Framerate"
+msgstr "帧速率"
+
+#: src/bin/e_configure_option.c:1516
+msgid "The framerate at which animations in Enlightenment occur"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1518
+#, fuzzy
+msgid "Application exec priority"
+msgstr "应用程序优先级"
+
+#: src/bin/e_configure_option.c:1518 src/bin/e_configure_option.c:1701
+#: src/bin/e_configure_option.c:1702 src/bin/e_configure_option.c:2019
+#: src/modules/conf_applications/e_mod_main.c:71
+#: src/modules/conf_applications/e_mod_main.c:74
+#: src/modules/conf_applications/e_mod_main.c:77
+#: src/modules/conf_applications/e_mod_main.c:80
+#: src/modules/conf_applications/e_mod_main.c:83
+#: src/modules/conf_applications/e_mod_main.c:86
+#: src/modules/conf_applications/e_mod_main.c:89
+#: src/modules/conf_applications/e_mod_main.c:92
+#: src/modules/conf_applications/e_mod_main.c:95
+#, fuzzy
+msgid "application"
+msgstr "应用程序"
+
+#: src/bin/e_configure_option.c:1518 src/bin/e_configure_option.c:1706
+#: src/bin/e_configure_option.c:1735 src/bin/e_configure_option.c:1737
+#: src/bin/e_configure_option.c:1966 src/bin/e_configure_option.c:2064
+#: src/modules/conf_applications/e_mod_main.c:71
+#: src/modules/conf_applications/e_mod_main.c:74
+#: src/modules/conf_applications/e_mod_main.c:77
+#: src/modules/conf_applications/e_mod_main.c:80
+#: src/modules/conf_applications/e_mod_main.c:83
+#: src/modules/conf_applications/e_mod_main.c:86
+#: src/modules/conf_applications/e_mod_main.c:89
+#: src/modules/conf_applications/e_mod_main.c:92
+#: src/modules/conf_applications/e_mod_main.c:95
+#: src/modules/everything/e_mod_main.c:70
+#, fuzzy
+msgid "exec"
+msgstr "执行"
+
+#: src/bin/e_configure_option.c:1518 src/bin/e_configure_option.c:1844
+#: src/bin/e_configure_option.c:2055
+msgid "priority"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1521
+#: src/modules/conf_performance/e_int_config_performance.c:138
+msgid "Image cache size"
+msgstr "图片缓存大小"
+
+#: src/bin/e_configure_option.c:1521 src/bin/e_configure_option.c:1524
+#: src/bin/e_configure_option.c:1527 src/bin/e_configure_option.c:1530
+#: src/bin/e_configure_option.c:1533 src/bin/e_configure_option.c:2054
+#, fuzzy
+msgid "cache"
+msgstr "缓存"
+
+#: src/bin/e_configure_option.c:1521 src/bin/e_configure_option.c:1693
+#: src/bin/e_configure_option.c:1710 src/bin/e_configure_option.c:1844
+#: src/bin/e_configure_option.c:1898 src/bin/e_configure_option.c:1900
+#: src/bin/e_configure_option.c:1902 src/bin/e_configure_option.c:1955
+#: src/bin/e_configure_option.c:1957 src/bin/e_configure_option.c:1963
+#: src/bin/e_configure_option.c:2065 src/modules/fileman/e_mod_main.c:393
+#: src/modules/fileman/e_mod_main.c:438 src/modules/fileman/e_mod_main.c:448
+#, fuzzy
+msgid "image"
+msgstr "图片"
+
+#: src/bin/e_configure_option.c:1521 src/bin/e_configure_option.c:1524
+#: src/bin/e_configure_option.c:1527 src/bin/e_configure_option.c:1530
+#: src/bin/e_configure_option.c:1801 src/bin/e_configure_option.c:1802
+#: src/bin/e_configure_option.c:1807 src/bin/e_configure_option.c:1840
+#: src/bin/e_configure_option.c:1887 src/bin/e_configure_option.c:1890
+#: src/bin/e_configure_option.c:1892 src/bin/e_configure_option.c:1894
+#: src/bin/e_configure_option.c:1898 src/bin/e_configure_option.c:1900
+#: src/bin/e_configure_option.c:1902 src/modules/conf_randr/e_mod_main.c:31
+#: src/modules/fileman/e_mod_main.c:416 src/modules/fileman/e_mod_main.c:438
+#, fuzzy
+msgid "size"
+msgstr "改变大小"
+
+#: src/bin/e_configure_option.c:1524
+#: src/modules/conf_performance/e_int_config_performance.c:132
+msgid "Font cache size"
+msgstr "字体缓存大小"
+
+#: src/bin/e_configure_option.c:1524 src/bin/e_configure_option.c:1727
+#: src/bin/e_configure_option.c:2012 src/modules/conf_theme/e_mod_main.c:180
+msgid "font"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1527
+#, fuzzy
+msgid "Edje cache size"
+msgstr "图片缓存大小"
+
+#: src/bin/e_configure_option.c:1527 src/bin/e_configure_option.c:1530
+#: src/modules/conf_bindings/e_mod_main.c:63
+msgid "edje"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1530
+#, fuzzy
+msgid "Edje collection cache size"
+msgstr "缓存 Edje 集合的数目"
+
+#: src/bin/e_configure_option.c:1533
+#, fuzzy
+msgid "Cache flushing interval"
+msgstr "缓存刷新间隔"
+
+#: src/bin/e_configure_option.c:1537
+#, fuzzy
+msgid "Horizontal virtual desktop count"
+msgstr "水平排列"
+
+#: src/bin/e_configure_option.c:1539
+#, fuzzy
+msgid "Vertical virtual desktop count"
+msgstr "设定虚拟桌面"
+
+#: src/bin/e_configure_option.c:1541
+msgid "Edge flip while dragging"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1541 src/bin/e_configure_option.c:1826
+#: src/bin/e_configure_option.c:1827 src/bin/e_configure_option.c:1828
+#: src/modules/conf_bindings/e_mod_main.c:60
+msgid "edge"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1541 src/bin/e_configure_option.c:1826
+#: src/bin/e_configure_option.c:1827 src/bin/e_configure_option.c:1828
+#: src/bin/e_configure_option.c:1830
+msgid "flip"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1541 src/bin/e_configure_option.c:2050
+#: src/modules/conf_bindings/e_mod_main.c:50
+#: src/modules/conf_bindings/e_mod_main.c:53
+#: src/modules/conf_bindings/e_mod_main.c:56
+#: src/modules/conf_bindings/e_mod_main.c:60
+#: src/modules/conf_bindings/e_mod_main.c:63
+#, fuzzy
+msgid "binding"
+msgstr "ACPI 绑定"
+
+#: src/bin/e_configure_option.c:1542
+#, fuzzy
+msgid "Enable edge binding functionality while dragging objects to screen edge"
+msgstr "拖拽对象到屏幕边缘时翻转"
+
+#: src/bin/e_configure_option.c:1543
+#: src/modules/conf_performance/e_int_config_engine.c:87
+#: src/modules/conf_performance/e_int_config_engine.c:108
+msgid "Use shaped windows instead of ARGB"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1545
+#, fuzzy
+msgid "Module settings"
+msgstr "模块设置"
+
+#: src/bin/e_configure_option.c:1545 src/bin/e_configure_option.c:1548
+#: src/bin/e_configure_option.c:2060
+#, fuzzy
+msgid "module"
+msgstr "模块"
+
+#: src/bin/e_configure_option.c:1548
+#, fuzzy
+msgid "Disable module delay"
+msgstr "允许模块加载延迟"
+
+#: src/bin/e_configure_option.c:1549
+msgid ""
+"If enabled, this causes E to load all modules at once during startup instead "
+"of loading them incrementally"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1562
+#, fuzzy
+msgid "Window placement policy"
+msgstr "窗口几何形状"
+
+#: src/bin/e_configure_option.c:1562 src/bin/e_configure_option.c:1566
+#: src/bin/e_configure_option.c:1567 src/bin/e_configure_option.c:1605
+#: src/bin/e_configure_option.c:1608 src/bin/e_configure_option.c:1627
+#: src/bin/e_configure_option.c:1629 src/bin/e_configure_option.c:1631
+#: src/bin/e_configure_option.c:1633 src/bin/e_configure_option.c:1635
+#: src/bin/e_configure_option.c:1637 src/bin/e_configure_option.c:1639
+#: src/bin/e_configure_option.c:1641 src/bin/e_configure_option.c:1651
+#: src/bin/e_configure_option.c:1653 src/bin/e_configure_option.c:1674
+#: src/bin/e_configure_option.c:1675 src/bin/e_configure_option.c:1676
+#: src/bin/e_configure_option.c:1677 src/bin/e_configure_option.c:1685
+#: src/bin/e_configure_option.c:1686 src/bin/e_configure_option.c:1687
+#: src/bin/e_configure_option.c:1688 src/bin/e_configure_option.c:1689
+#: src/bin/e_configure_option.c:1690 src/bin/e_configure_option.c:1840
+#: src/bin/e_configure_option.c:1872 src/bin/e_configure_option.c:1874
+#: src/bin/e_configure_option.c:1876 src/bin/e_configure_option.c:1878
+#: src/bin/e_configure_option.c:1880 src/bin/e_configure_option.c:2034
+#: src/modules/tiling/e_mod_tiling.c:3921
+#, fuzzy
+msgid "placement"
+msgstr "放置"
+
+#: src/bin/e_configure_option.c:1565
+msgid "Determines where and how new windows are placed when created"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1566
+msgid "Group new windows from same application"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1567
+#, fuzzy
+msgid "Switch to desk of new window"
+msgstr "切换到新窗口桌面"
+
+#: src/bin/e_configure_option.c:1569
+#, fuzzy
+msgid "Window focus policy"
+msgstr "窗口焦点"
+
+#: src/bin/e_configure_option.c:1569 src/bin/e_configure_option.c:1572
+#: src/bin/e_configure_option.c:1575 src/bin/e_configure_option.c:1577
+#: src/bin/e_configure_option.c:1580 src/bin/e_configure_option.c:1581
+#: src/bin/e_configure_option.c:1582 src/bin/e_configure_option.c:1583
+#: src/bin/e_configure_option.c:1585 src/bin/e_configure_option.c:1586
+#: src/bin/e_configure_option.c:1587 src/bin/e_configure_option.c:1588
+#: src/bin/e_configure_option.c:1589 src/bin/e_configure_option.c:1591
+#: src/bin/e_configure_option.c:1592 src/bin/e_configure_option.c:1611
+#: src/bin/e_configure_option.c:1612 src/bin/e_configure_option.c:1613
+#: src/bin/e_configure_option.c:1625 src/bin/e_configure_option.c:1626
+#: src/bin/e_configure_option.c:1653 src/bin/e_configure_option.c:2032
+#: src/modules/quickaccess/e_mod_main.c:74
+#, fuzzy
+msgid "focus"
+msgstr "焦点"
+
+#: src/bin/e_configure_option.c:1572
+#, fuzzy
+msgid "New window focus policy"
+msgstr "新窗口焦点"
+
+#: src/bin/e_configure_option.c:1575
+#, fuzzy
+msgid "Pass click to unfocused windows"
+msgstr "点击后窗口获得焦点"
+
+#: src/bin/e_configure_option.c:1575 src/bin/e_configure_option.c:1580
+#: src/bin/e_configure_option.c:1581 src/bin/e_configure_option.c:1858
+#, fuzzy
+msgid "click"
+msgstr "点击"
+
+#: src/bin/e_configure_option.c:1576
+msgid ""
+"When clicking an unfocused window, pass this click through to the "
+"application instead of only using it to focus the window"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1577
+msgid "Policy when applications request focus"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1580
+msgid "Always raise window when clicked"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1580 src/bin/e_configure_option.c:1582
+#: src/bin/e_configure_option.c:1583 src/bin/e_configure_option.c:1591
+#: src/bin/e_configure_option.c:1592 src/bin/e_configure_option.c:1623
+#: src/bin/e_configure_option.c:1626 src/bin/e_configure_option.c:1687
+#: src/bin/e_configure_option.c:1688
+#, fuzzy
+msgid "raise"
+msgstr "提升"
+
+#: src/bin/e_configure_option.c:1581
+#, fuzzy
+msgid "Always focus window when clicked"
+msgstr "启动时总是获得焦点"
+
+#: src/bin/e_configure_option.c:1582
+msgid "Enable window autoraise"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1583
+#, fuzzy
+msgid "Window autoraise delay"
+msgstr "窗口显示"
+
+#: src/bin/e_configure_option.c:1585
+#, fuzzy
+msgid "Revert window focus on desk switch"
+msgstr "桌面切换时重聚焦上次的窗口"
+
+#: src/bin/e_configure_option.c:1586
+msgid "Revert window focus on window hide or close"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1587
+#, fuzzy
+msgid "Warp pointer to new windows and away from closed windows"
+msgstr "滑动指针到新聚焦的窗口"
+
+#: src/bin/e_configure_option.c:1587 src/bin/e_configure_option.c:1588
+#: src/bin/e_configure_option.c:1589 src/bin/e_configure_option.c:1611
+#: src/bin/e_configure_option.c:1612 src/bin/e_configure_option.c:1613
+#: src/bin/e_configure_option.c:1800
+msgid "warp"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1588
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:326
+msgid "Prevent all forms of pointer warping"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1589
+msgid "Speed to move pointer when warping between windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1591
+#, fuzzy
+msgid "Windows raise on mouse move/resize"
+msgstr "当鼠标移动到窗口时提升窗口"
+
+#: src/bin/e_configure_option.c:1591 src/bin/e_configure_option.c:1608
+#: src/bin/e_configure_option.c:1675 src/bin/e_configure_option.c:1677
+#: src/bin/e_configure_option.c:1686 src/bin/e_configure_option.c:1878
+#: src/bin/e_configure_option.c:1880 src/bin/e_configure_option.c:2041
+#, fuzzy
+msgid "resize"
+msgstr "改变大小"
+
+#: src/bin/e_configure_option.c:1592
+#, fuzzy
+msgid "Windows raise when focused"
+msgstr "聚焦时提升"
+
+#: src/bin/e_configure_option.c:1594
+#, fuzzy
+msgid "Shelf gadget resistance"
+msgstr "阴影距离"
+
+#: src/bin/e_configure_option.c:1594 src/bin/e_configure_option.c:1602
+#: src/bin/e_configure_option.c:1704 src/bin/e_configure_option.c:1868
+#, fuzzy
+msgid "gadget"
+msgstr "组件"
+
+#: src/bin/e_configure_option.c:1594 src/bin/e_configure_option.c:1597
+#: src/bin/e_configure_option.c:1598 src/bin/e_configure_option.c:1600
+#: src/bin/e_configure_option.c:1602 src/bin/e_configure_option.c:1853
+#: src/bin/e_configure_option.c:2035
+#, fuzzy
+msgid "resist"
+msgstr "阻抗"
+
+#: src/bin/e_configure_option.c:1594 src/bin/e_configure_option.c:1651
+#: src/bin/e_configure_option.c:2028 src/modules/conf_shelves/e_mod_main.c:38
+#, fuzzy
+msgid "shelf"
+msgstr "书架"
+
+#: src/bin/e_configure_option.c:1597
+#, fuzzy
+msgid "Enable resistance when dragging windows"
+msgstr "拖拽阻力"
+
+#: src/bin/e_configure_option.c:1598
+msgid "Window resistance against screen edges"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1600
+msgid "Window resistance against other windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1602
+msgid "Window resistance against desktop gadgets"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1605
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:263
+msgid "Ensure initial placement of windows inside useful geometry"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1606
+msgid ""
+"Useful geometry is calculated as the screen size minus the geometry of any "
+"shelves which do not allow windows to overlap them.This option ensures that "
+"non-user placement of windows will be inside the useful geometry of the "
+"current screen"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1608
+#, fuzzy
+msgid "Limit window autoresizing to useful geometry"
+msgstr "可更改的最小尺寸"
+
+#: src/bin/e_configure_option.c:1609
+msgid ""
+"Useful geometry is calculated as the screen size minus the geometry of any "
+"shelves which do not allow windows to overlap them"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1611
+msgid "Winlist moves pointer to currently selected window while selecting"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1611 src/bin/e_configure_option.c:1612
+#: src/bin/e_configure_option.c:1613 src/bin/e_configure_option.c:1615
+#: src/bin/e_configure_option.c:1616 src/bin/e_configure_option.c:1618
+#: src/bin/e_configure_option.c:1619 src/bin/e_configure_option.c:1620
+#: src/bin/e_configure_option.c:1621 src/bin/e_configure_option.c:1622
+#: src/bin/e_configure_option.c:1623 src/bin/e_configure_option.c:1624
+#: src/bin/e_configure_option.c:1625 src/bin/e_configure_option.c:1626
+#: src/bin/e_configure_option.c:1627 src/bin/e_configure_option.c:1629
+#: src/bin/e_configure_option.c:1631 src/bin/e_configure_option.c:1633
+#: src/bin/e_configure_option.c:1635 src/bin/e_configure_option.c:1637
+#: src/bin/e_configure_option.c:1639 src/bin/e_configure_option.c:1641
+#: src/bin/e_configure_option.c:2033
+#, fuzzy
+msgid "winlist"
+msgstr "窗口列表对象"
+
+#: src/bin/e_configure_option.c:1612
+msgid "Winlist moves pointer to currently selected window after winlist closes"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1613
+msgid "Disable pointer warping on winlist directional focus change"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1614
+msgid ""
+"This option, when enabled, disables pointer warping only when switching "
+"windows using a directional winlist action (up/down/left/right)"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1615
+#, fuzzy
+msgid "Enable winlist scroll animation"
+msgstr "允许应用程序使用图标主题"
+
+#: src/bin/e_configure_option.c:1616
+#, fuzzy
+msgid "Winlist scroll speed"
+msgstr "滚屏速度"
+
+#: src/bin/e_configure_option.c:1618
+#, fuzzy
+msgid "Winlist shows iconified windows"
+msgstr "图标化窗口"
+
+#: src/bin/e_configure_option.c:1618 src/bin/e_configure_option.c:1619
+#: src/bin/e_configure_option.c:1620 src/bin/e_configure_option.c:1691
+#: src/bin/e_configure_option.c:1797 src/bin/e_configure_option.c:2037
+#: src/bin/e_configure_option.c:2068
+#, fuzzy
+msgid "minimize"
+msgstr "最小尺寸"
+
+#: src/bin/e_configure_option.c:1619
+#, fuzzy
+msgid "Winlist shows iconified windows from other desks"
+msgstr "来自其他桌面图标化程序"
+
+#: src/bin/e_configure_option.c:1620
+#, fuzzy
+msgid "Winlist shows iconified windows from other screens"
+msgstr "包含其他屏幕上的窗口"
+
+#: src/bin/e_configure_option.c:1621
+#, fuzzy
+msgid "Winlist shows windows from other desks"
+msgstr "来自其他桌面的窗口"
+
+#: src/bin/e_configure_option.c:1622
+#, fuzzy
+msgid "Winlist shows windows from other screens"
+msgstr "来自其他屏幕的窗口"
+
+#: src/bin/e_configure_option.c:1623
+msgid "Winlist uniconifies and unshades windows while selecting"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1624
+#, fuzzy
+msgid "Winlist switches desks while selecting"
+msgstr "选择时鼠标可以回绕"
+
+#: src/bin/e_configure_option.c:1625
+#, fuzzy
+msgid "Winlist focuses windows while selecting"
+msgstr "选择时鼠标可以回绕"
+
+#: src/bin/e_configure_option.c:1626
+#, fuzzy
+msgid "Winlist raises windows while selecting"
+msgstr "选择时鼠标可以回绕"
+
+#: src/bin/e_configure_option.c:1627
+#, fuzzy
+msgid "Winlist horizontal alignment"
+msgstr "水平排列"
+
+#: src/bin/e_configure_option.c:1629
+#, fuzzy
+msgid "Winlist vertical alignment"
+msgstr "垂直排列"
+
+#: src/bin/e_configure_option.c:1631
+#, fuzzy
+msgid "Winlist width"
+msgstr "窗口列表标题"
+
+#: src/bin/e_configure_option.c:1633
+#, fuzzy
+msgid "Winlist height"
+msgstr "窗口列表标题"
+
+#: src/bin/e_configure_option.c:1635
+#, fuzzy
+msgid "Winlist minimum width"
+msgstr "最小宽度"
+
+#: src/bin/e_configure_option.c:1637
+#, fuzzy
+msgid "Winlist minimum height"
+msgstr "最小高度"
+
+#: src/bin/e_configure_option.c:1639
+#, fuzzy
+msgid "Winlist maximum width"
+msgstr "最大宽度"
+
+#: src/bin/e_configure_option.c:1641
+#, fuzzy
+msgid "Winlist maximum height"
+msgstr "最大高度"
+
+#: src/bin/e_configure_option.c:1644
+#, fuzzy
+msgid "Fullscreen window policy"
+msgstr "全屏状态切换"
+
+#: src/bin/e_configure_option.c:1644 src/bin/e_configure_option.c:1653
+#: src/bin/e_configure_option.c:1827
+#, fuzzy
+msgid "fullscreen"
+msgstr "全屏"
+
+#: src/bin/e_configure_option.c:1647
+#, fuzzy
+msgid "Window maximize policy"
+msgstr "窗口显示"
+
+#: src/bin/e_configure_option.c:1647 src/bin/e_configure_option.c:1650
+#, fuzzy
+msgid "maximize"
+msgstr "还原"
+
+#: src/bin/e_configure_option.c:1650
+#, fuzzy
+msgid "Allow moving of maximized windows"
+msgstr "允许自定义最大化窗口"
+
+#: src/bin/e_configure_option.c:1651
+#, fuzzy
+msgid "Adjust windows on shelf toggle"
+msgstr "书架隐藏时调整窗口"
+
+#: src/bin/e_configure_option.c:1652
+msgid ""
+"When using an autohiding shelf, this option causes maximized windows to "
+"expand and contract to fill the space that the shelf occupies when it hides"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1653
+#, fuzzy
+msgid "Allow windows above fullscreen windows"
+msgstr "允许窗口位于全屏窗口之上"
+
+#: src/bin/e_configure_option.c:1655
+#, fuzzy
+msgid "Kill window if process not responding to close"
+msgstr "杀死进程而不是客户端"
+
+#: src/bin/e_configure_option.c:1655 src/bin/e_configure_option.c:1656
+#: src/bin/e_configure_option.c:1657 src/bin/e_configure_option.c:2038
+msgid "kill"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1656
+#: src/modules/conf_window_manipulation/e_int_config_window_process.c:97
+msgid "Kill process instead of client"
+msgstr "杀死进程而不是客户端"
+
+#: src/bin/e_configure_option.c:1657
+#, fuzzy
+msgid "Window kill delay"
+msgstr "窗口显示"
+
+#: src/bin/e_configure_option.c:1659
+#, fuzzy
+msgid "Enable window client pinging"
+msgstr "开启屏幕空白"
+
+#: src/bin/e_configure_option.c:1660
+msgid "Window client ping interval (CPU ticks)"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1667
+#, fuzzy
+msgid "Remember internal window geometry"
+msgstr "记住内部对话框"
+
+#: src/bin/e_configure_option.c:1667 src/bin/e_configure_option.c:1669
+#: src/bin/e_configure_option.c:1671 src/bin/e_configure_option.c:2036
+#: src/modules/conf_window_remembers/e_mod_main.c:28
+#, fuzzy
+msgid "remember"
+msgstr "记住"
+
+#: src/bin/e_configure_option.c:1668
+msgid ""
+"This option causes E to remember the geometry of its internal dialogs and "
+"windows, NOT including filemanager windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1669
+#, fuzzy
+msgid "Remember internal filemanager window geometry"
+msgstr "记住文件管理器窗口"
+
+#: src/bin/e_configure_option.c:1669 src/bin/e_configure_option.c:1671
+#: src/bin/e_configure_option.c:1856 src/bin/e_configure_option.c:1858
+#: src/bin/e_configure_option.c:1860 src/bin/e_configure_option.c:1863
+#: src/bin/e_configure_option.c:1864 src/bin/e_configure_option.c:1865
+#: src/bin/e_configure_option.c:1866 src/bin/e_configure_option.c:2020
+#: src/modules/fileman/e_mod_main.c:51 src/modules/fileman/e_mod_main.c:52
+#: src/modules/fileman/e_mod_main.c:161 src/modules/fileman/e_mod_main.c:162
+#: src/modules/fileman/e_mod_main.c:163 src/modules/fileman/e_mod_main.c:389
+#: src/modules/fileman/e_mod_main.c:393 src/modules/fileman/e_mod_main.c:397
+#: src/modules/fileman/e_mod_main.c:399 src/modules/fileman/e_mod_main.c:401
+#: src/modules/fileman/e_mod_main.c:403 src/modules/fileman/e_mod_main.c:407
+#: src/modules/fileman/e_mod_main.c:410 src/modules/fileman/e_mod_main.c:412
+#: src/modules/fileman/e_mod_main.c:414 src/modules/fileman/e_mod_main.c:416
+#: src/modules/fileman/e_mod_main.c:420 src/modules/fileman/e_mod_main.c:422
+#: src/modules/fileman/e_mod_main.c:426 src/modules/fileman/e_mod_main.c:428
+#: src/modules/fileman/e_mod_main.c:430 src/modules/fileman/e_mod_main.c:432
+#: src/modules/fileman/e_mod_main.c:438 src/modules/fileman/e_mod_main.c:442
+#: src/modules/fileman/e_mod_main.c:448 src/modules/fileman/e_mod_main.c:452
+#: src/modules/fileman/e_mod_main.c:453
+#, fuzzy
+msgid "files"
+msgstr "文件"
+
+#: src/bin/e_configure_option.c:1670
+msgid ""
+"This option causes E to remember the geometry of its internal filemanager "
+"windows, NOT including dialog windows, based on the directory the window is "
+"showing"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1671
+#, fuzzy
+msgid "Remember internal filemanager window geometry globally"
+msgstr "记住文件管理器窗口"
+
+#: src/bin/e_configure_option.c:1672
+msgid ""
+"This option causes E to remember the geometry of its internal filemanager "
+"windows globally instead of using the target directory"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1674
+msgid "Window position info follows window when moving"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1675
+msgid "Window geometry info follows window when resizing"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1676
+msgid "Window position info visible when moving"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1677
+msgid "Window geometry info visible when resizing"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1685
+msgid "Transient windows follow movement of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1685 src/bin/e_configure_option.c:1686
+#: src/bin/e_configure_option.c:1687 src/bin/e_configure_option.c:1688
+#: src/bin/e_configure_option.c:1689 src/bin/e_configure_option.c:1690
+#: src/bin/e_configure_option.c:1691 src/bin/e_configure_option.c:2039
+#, fuzzy
+msgid "transient"
+msgstr "暂时"
+
+#: src/bin/e_configure_option.c:1686
+msgid "Transient windows follow resize of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1687
+msgid "Transient windows follow raise of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1688
+msgid "Transient windows follow lower of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1689
+msgid "Transient windows follow layer change of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1690
+msgid "Transient windows follow desk change of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1691
+msgid "Transient windows follow iconification of their child"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1693
+#: src/modules/conf_menus/e_int_config_menus.c:302
+#, fuzzy
+msgid "Disable icons in menus"
+msgstr "禁用移动"
+
+#: src/bin/e_configure_option.c:1694
+#, fuzzy
+msgid "Application menus shows Name field"
+msgstr "应用程序文件或名称(.desktop)"
+
+#: src/bin/e_configure_option.c:1695 src/bin/e_configure_option.c:1697
+#: src/bin/e_configure_option.c:1699
+msgid "This information is taken from the related .desktop file"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1696
+msgid "Application menus shows Generic field"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1698
+msgid "Application menus shows Comment field"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1701
+#, fuzzy
+msgid "Show Favorite Applications in the main menu"
+msgstr "最常用程序"
+
+#: src/bin/e_configure_option.c:1702
+#, fuzzy
+msgid "Show Applications in the main menu"
+msgstr "显示所有应用程序菜单"
+
+#: src/bin/e_configure_option.c:1704
+#, fuzzy
+msgid "Show gadget settings in top-level gadget menu"
+msgstr "在最上面一级显示组件设置"
+
+#: src/bin/e_configure_option.c:1706
+msgid "Launch commands with this command"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1708
+msgid "Command used to launch files and applications"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1710
+#, fuzzy
+msgid "Window borders use application icon"
+msgstr "窗口边框选择"
+
+#: src/bin/e_configure_option.c:1711
+msgid ""
+"Applications provide their own icons. If this option is not set, E will use "
+"internal theme icons instead of the application-provided icon"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1718
+#, fuzzy
+msgid "Disable confirmation dialogs"
+msgstr "禁用确认对话框"
+
+#: src/bin/e_configure_option.c:1718
+#, fuzzy
+msgid "confirm"
+msgstr "确定"
+
+#: src/bin/e_configure_option.c:1718 src/bin/e_configure_option.c:1720
+#: src/bin/e_configure_option.c:1722 src/bin/e_configure_option.c:1724
+#: src/bin/e_configure_option.c:2058 src/modules/tiling/e_mod_tiling.c:3921
+#, fuzzy
+msgid "dialog"
+msgstr "对话框"
+
+#: src/bin/e_configure_option.c:1719
+msgid ""
+"This option suppresses all confirmation dialogs and assumes that the user "
+"has clicked the confirm option"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1720
+msgid "Configuration dialogs automatically apply their changes"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1720 src/bin/e_configure_option.c:1722
+#: src/bin/e_configure_option.c:1870 src/bin/e_configure_option.c:2058
+#: src/bin/e_configure_option.c:2059 src/bin/e_configure_option.c:2060
+#: src/bin/e_configure_option.c:2061 src/modules/everything/e_mod_main.c:70
+#: src/modules/fileman/e_mod_main.c:448
+#: src/modules/quickaccess/e_mod_main.c:68
+#, fuzzy
+msgid "settings"
+msgstr "设置"
+
+#: src/bin/e_configure_option.c:1721
+msgid ""
+"This option causes any configuration options to be applied immediately when "
+"changed instead of requiring the 'Apply' button to be clicked"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1722
+msgid "Configuration dialogs show advanced view by default"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1723
+msgid ""
+"Configurations dialogs can have basic and advanced views; this option causes "
+"all configuration dialogs to show the advanced view by default"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1724
+msgid "Configuration dialog windows are normal windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1725
+msgid ""
+"This option causes configuration dialogs to be normal windows instead of "
+"dialog windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1727
+msgid "Set font hinting mode"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1727
+#, fuzzy
+msgid "hinting"
+msgstr "微调"
+
+#: src/bin/e_configure_option.c:1735
+msgid "Use custom command for desklock"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1735 src/bin/e_configure_option.c:1737
+#: src/bin/e_configure_option.c:1739 src/bin/e_configure_option.c:1742
+#: src/bin/e_configure_option.c:1743 src/bin/e_configure_option.c:1744
+#: src/bin/e_configure_option.c:1745 src/bin/e_configure_option.c:1747
+#: src/bin/e_configure_option.c:1748 src/bin/e_configure_option.c:1750
+#: src/bin/e_configure_option.c:1751 src/bin/e_configure_option.c:1752
+#: src/bin/e_configure_option.c:2024
+#: src/modules/conf_applications/e_mod_main.c:83
+#: src/modules/conf_applications/e_mod_main.c:86
+#: src/modules/conf_intl/e_mod_main.c:41
+#, fuzzy
+msgid "desklock"
+msgstr "设置桌面锁定"
+
+#: src/bin/e_configure_option.c:1736
+msgid "This option allows an external application to manage desklock"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1737
+#, fuzzy
+msgid "Custom desklock command"
+msgstr "自定义屏幕锁定命令"
+
+#: src/bin/e_configure_option.c:1739
+msgid "Desklock login box shows on which screen?"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1742
+#, fuzzy
+msgid "Desklock activates on login"
+msgstr "无应用程序"
+
+#: src/bin/e_configure_option.c:1743
+msgid "Desklock activates on resume from suspend"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1744
+msgid "Desklock activates during screensaver"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1744 src/bin/e_configure_option.c:1745
+#: src/bin/e_configure_option.c:1755 src/bin/e_configure_option.c:1756
+#: src/bin/e_configure_option.c:1762 src/bin/e_configure_option.c:1764
+#: src/bin/e_configure_option.c:1767 src/bin/e_configure_option.c:1769
+#: src/bin/e_configure_option.c:1771
+#, fuzzy
+msgid "screensaver"
+msgstr "设置屏幕保护程序"
+
+#: src/bin/e_configure_option.c:1745
+#, fuzzy
+msgid "Desklock activates X seconds after screensaver activates"
+msgstr "当屏幕保护程序运行时锁定"
+
+#: src/bin/e_configure_option.c:1747
+#, fuzzy
+msgid "Desklock activates when idle"
+msgstr "桌面锁定标题"
+
+#: src/bin/e_configure_option.c:1748
+msgid "Desklock activates when idle for X seconds"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1750
+#, fuzzy
+msgid "Use custom desklock wallpaper"
+msgstr "使用主题墙纸"
+
+#: src/bin/e_configure_option.c:1751
+msgid "Prompt for desklock timer delay if deactivated quickly"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1752
+msgid "Desklock quick deactivation timer delay"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1755
+#, fuzzy
+msgid "Enable screensaver"
+msgstr "开启屏幕空白"
+
+#: src/bin/e_configure_option.c:1756
+msgid "Screensaver activates when idle for X seconds"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1762
+msgid "Prompt for screensaver timer delay if deactivated quickly"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1764
+msgid "Screensaver quick deactivation timer delay"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1767
+#, fuzzy
+msgid "Suspend when screensaver activates"
+msgstr "当屏幕保护程序运行时锁定"
+
+#: src/bin/e_configure_option.c:1769
+msgid "Suspend when screensaver activates even if on AC"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1771
+#, fuzzy
+msgid "Screensaver suspend delay"
+msgstr "挂起延迟"
+
+#: src/bin/e_configure_option.c:1787
+#, fuzzy
+msgid "Window list menu grouping policy"
+msgstr "窗口列表菜单设置"
+
+#: src/bin/e_configure_option.c:1790
+#, fuzzy
+msgid "Window list menu includes windows from all screens"
+msgstr "在所有屏幕显示窗口"
+
+#: src/bin/e_configure_option.c:1791
+#, fuzzy
+msgid "Window list menu separator policy"
+msgstr "窗口列表菜单设置"
+
+#: src/bin/e_configure_option.c:1794
+#, fuzzy
+msgid "Window list menu sort policy"
+msgstr "窗口列表菜单设置"
+
+#: src/bin/e_configure_option.c:1797
+msgid "Window list menu iconified window grouping policy"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1800
+msgid "Window list menu warps to desktop of selected iconified window"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1801
+msgid "Enable window list menu length limit"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1802
+msgid "Window list menu length limit (characters)"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1805
+#, fuzzy
+msgid "Use Enlightenment theme cursor"
+msgstr "Enlightenment 无法设定它的记忆设置。\n"
+
+#: src/bin/e_configure_option.c:1807
+#, fuzzy
+msgid "Mouse cursor size"
+msgstr "鼠标按键"
+
+#: src/bin/e_configure_option.c:1810
+#, fuzzy
+msgid "Show mouse cursor"
+msgstr "显示光标"
+
+#: src/bin/e_configure_option.c:1812
+#, fuzzy
+msgid "Enable idle effects for mouse cursor"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_configure_option.c:1814
+msgid "Enable left-handed mouse"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1822
+#, fuzzy
+msgid "Mouse acceleration threshold"
+msgstr "鼠标加速"
+
+#: src/bin/e_configure_option.c:1826
+msgid "Enable desk flip between last and first desks"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1827
+#, fuzzy
+msgid "Enable desk flipping with fullscreen windows"
+msgstr "允许绑定以全屏窗口激活"
+
+#: src/bin/e_configure_option.c:1828
+#, fuzzy
+msgid "Enable desk flipping with multiple monitors (DANGEROUS)"
+msgstr "允许绑定以全屏窗口激活"
+
+#: src/bin/e_configure_option.c:1830
+#, fuzzy
+msgid "Desk flip animation type"
+msgstr "翻转动画"
+
+#: src/bin/e_configure_option.c:1835
+#, fuzzy
+msgid "Default window border style"
+msgstr "默认边框样式"
+
+#: src/bin/e_configure_option.c:1840
+msgid "Window screen limit policy"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1844
+msgid "Thumbnailing process priority"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1846
+msgid ""
+"Enlightenment runs its own thumbnailing daemon in the background. This "
+"option configures the priority of that process"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1848
+msgid "Enable click-to-drag scrolling (thumbscrolling)"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1849
+#, fuzzy
+msgid "Thumbscroll threshold"
+msgstr "缩略图滚动"
+
+#: src/bin/e_configure_option.c:1851
+msgid "Thumbscroll momentum threshold"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1853
+#, fuzzy
+msgid "Thumbscroll resistance"
+msgstr "缩略图滚动"
+
+#: src/bin/e_configure_option.c:1856
+#, fuzzy
+msgid "Show files on desktop"
+msgstr "在桌面上显示设备图标"
+
+#: src/bin/e_configure_option.c:1858
+msgid "Filemanager uses single click to activate"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1860
+msgid "Filemanager shows removable devices on desktop"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1863
+msgid "Filemanager automatically mounts removable devices when attached"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1864
+msgid "Filemanager automatically opens removable devices when attached"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1865
+msgid "Filemanager always performs `cp+rm` instead of `mv`"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1866
+#, fuzzy
+msgid "Filemanager deletes files securely"
+msgstr "文件管理器空闲"
+
+#: src/bin/e_configure_option.c:1868
+msgid "Only show label on keyboard gadgets instead of flags"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1868 src/bin/e_configure_option.c:1870
+#: src/bin/e_configure_option.c:1872 src/bin/e_configure_option.c:1874
+#: src/bin/e_configure_option.c:1876 src/bin/e_configure_option.c:1878
+#: src/bin/e_configure_option.c:1880 src/bin/e_configure_option.c:2049
+#: src/modules/conf_bindings/e_mod_main.c:50
+#: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3925
+#: src/modules/xkbswitch/e_mod_main.c:83
+msgid "key"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1870
+#, fuzzy
+msgid "Do not apply any keyboard layout settings"
+msgstr "键盘设置"
+
+#: src/bin/e_configure_option.c:1872
+msgid "Window change timeout when moving or resizing using keyboard"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1874
+msgid "Window horizontal movement speed when using keyboard"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1876 src/bin/e_configure_option.c:1880
+msgid "Window vertical movement speed when using keyboard"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1878
+msgid "Window horizontal resize speed when using keyboard"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1887
+#, fuzzy
+msgid "Overall scaling factor"
+msgstr "自定义缩放系数"
+
+#: src/bin/e_configure_option.c:1887 src/bin/e_configure_option.c:1890
+#: src/bin/e_configure_option.c:1892 src/bin/e_configure_option.c:1894
+#: src/bin/e_configure_option.c:2015
+#, fuzzy
+msgid "scale"
+msgstr "区域"
+
+#: src/bin/e_configure_option.c:1890
+msgid "Use screen DPI for scaling"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1892
+msgid "Use custom DPI for scaling"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1894
+msgid "Custom DPI to use when scaling"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1898
+msgid "System Console primary action icon size"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1898 src/bin/e_configure_option.c:1900
+#: src/bin/e_configure_option.c:1902 src/bin/e_configure_option.c:1904
+#: src/bin/e_configure_option.c:1906
+#, fuzzy
+msgid "syscon"
+msgstr "Syscon"
+
+#: src/bin/e_configure_option.c:1900
+msgid "System Console secondary action icon size"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1902
+msgid "System Console extra action icon size"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1904
+msgid "System Console idle timeout"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1906
+#, fuzzy
+msgid "System Console performs default action after idle timeout"
+msgstr "超时后做默认动作"
+
+#: src/bin/e_configure_option.c:1906 src/bin/e_configure_option.c:2047
+#: src/bin/e_configure_option.c:2048 src/bin/e_configure_option.c:2049
+#: src/bin/e_configure_option.c:2050 src/bin/e_configure_option.c:2051
+#: src/modules/conf_bindings/e_mod_main.c:50
+#: src/modules/conf_bindings/e_mod_main.c:53
+#: src/modules/conf_bindings/e_mod_main.c:56
+#: src/modules/conf_bindings/e_mod_main.c:60
+#: src/modules/conf_bindings/e_mod_main.c:63
+#: src/modules/conf_intl/e_mod_main.c:45 src/modules/xkbswitch/e_mod_main.c:83
+#, fuzzy
+msgid "input"
+msgstr "输入"
+
+#: src/bin/e_configure_option.c:1909
+msgid "Backlight \"normal\" brightness"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1909 src/bin/e_configure_option.c:1912
+#: src/bin/e_configure_option.c:1915 src/bin/e_configure_option.c:1918
+#: src/bin/e_configure_option.c:1920
+#, fuzzy
+msgid "backlight"
+msgstr "背光"
+
+#: src/bin/e_configure_option.c:1912
+#, fuzzy
+msgid "Backlight \"dim\" brightness"
+msgstr "最小背光"
+
+#: src/bin/e_configure_option.c:1915
+#, fuzzy
+msgid "Backlight transition length"
+msgstr "背光设置"
+
+#: src/bin/e_configure_option.c:1918
+#, fuzzy
+msgid "Backlight dims after idle"
+msgstr "背光调节"
+
+#: src/bin/e_configure_option.c:1920
+#, fuzzy
+msgid "Backlight idle delay"
+msgstr "中等背光"
+
+#: src/bin/e_configure_option.c:1940
+#, fuzzy
+msgid "Load ~/.Xresources on startup"
+msgstr "载入 X 资源"
+
+#: src/bin/e_configure_option.c:1940 src/bin/e_configure_option.c:1941
+#: src/bin/e_configure_option.c:1942 src/bin/e_configure_option.c:1943
+#: src/bin/e_configure_option.c:1945 src/bin/e_configure_option.c:1947
+#: src/bin/e_configure_option.c:1949 src/bin/e_configure_option.c:1955
+#: src/bin/e_configure_option.c:1957 src/bin/e_configure_option.c:1963
+#: src/modules/conf_paths/e_mod_main.c:35
+#: src/modules/conf_paths/e_mod_main.c:38
+#, fuzzy
+msgid "environment"
+msgstr "桌面环境"
+
+#: src/bin/e_configure_option.c:1941
+msgid "Load ~/.Xmodmap"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1942
+msgid "Run gnome-settings-daemon"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1943
+msgid "Run kdeinit"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1945
+#, fuzzy
+msgid "Enable GTK application settings"
+msgstr "启用 X 应用程序设置"
+
+#: src/bin/e_configure_option.c:1945 src/bin/e_configure_option.c:1947
+#: src/bin/e_configure_option.c:1949 src/bin/e_configure_option.c:1955
+#: src/bin/e_configure_option.c:1957 src/bin/e_configure_option.c:1963
+#: src/bin/e_configure_option.c:2016 src/bin/e_configure_option.c:2021
+#, fuzzy
+msgid "xsettings"
+msgstr "设置"
+
+#: src/bin/e_configure_option.c:1947
+msgid "Try setting GTK theme to match E17 theme"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1949
+msgid "GTK theme name"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1955
+#, fuzzy
+msgid "Enable use of icon theme for applications"
+msgstr "允许应用程序使用图标主题"
+
+#: src/bin/e_configure_option.c:1957
+#, fuzzy
+msgid "Icon theme"
+msgstr "图标名称"
+
+#: src/bin/e_configure_option.c:1963
+msgid "Icon theme overrides E17 internal theme icons"
+msgstr ""
+
+#: src/bin/e_configure_option.c:1966
+#, fuzzy
+msgid "Always launch applications as single-instance"
+msgstr "仅运行单个实例"
+
+#: src/bin/e_configure_option.c:2010 src/bin/e_configure_option.c:2011
+#: src/bin/e_configure_option.c:2012 src/bin/e_configure_option.c:2013
+#: src/bin/e_configure_option.c:2014 src/bin/e_configure_option.c:2015
+#: src/bin/e_configure_option.c:2016 src/bin/e_configure_option.c:2017
+#, fuzzy
+msgid "appearance"
+msgstr "外观"
+
+#: src/bin/e_configure_option.c:2019 src/bin/e_configure_option.c:2020
+#: src/bin/e_configure_option.c:2021 src/bin/e_configure_option.c:2022
+#, fuzzy
+msgid "applications"
+msgstr "应用程序"
+
+#: src/bin/e_configure_option.c:2044 src/bin/e_configure_option.c:2045
+#, fuzzy
+msgid "menus"
+msgstr "菜单"
+
+#: src/bin/e_configure_option.c:2053 src/bin/e_configure_option.c:2054
+#: src/bin/e_configure_option.c:2055 src/bin/e_configure_option.c:2056
+#, fuzzy
+msgid "advanced"
+msgstr "高级"
+
+#: src/bin/e_configure_option.c:2053
+#, fuzzy
+msgid "framerate"
+msgstr "帧速率"
+
+#: src/bin/e_configure_option.c:2059 src/modules/conf_dialogs/e_mod_main.c:28
+#, fuzzy
+msgid "profile"
+msgstr "配置文件"
+
+#: src/bin/e_configure_option.c:2063
+#, fuzzy
+msgid "window"
+msgstr "窗口"
+
+#: src/bin/e_configure_option.c:2064
+#, fuzzy
+msgid "launch"
+msgstr "启动"
+
+#: src/bin/e_configure_option.c:2065
+msgid "icon"
+msgstr ""
+
+#: src/bin/e_configure_option.c:2066
+#, fuzzy
+msgid "style"
+msgstr "风格"
+
+#: src/bin/e_configure_option.c:2067
+#, fuzzy
+msgid "cursor"
+msgstr "光标"
+
+#: src/bin/e_configure_option.c:2068
+#, fuzzy
+msgid "iconif"
+msgstr "最小化"
+
 #: src/bin/e_container.c:84
 #, c-format
 msgid "Container %d"
@@ -1143,8 +3184,8 @@ msgstr "desktop 文件"
 
 #: src/bin/e_desktop_editor.c:777 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
-#: src/modules/conf_comp/e_mod_config.c:575
 #: src/modules/conf_applications/e_int_config_defapps.c:358
+#: src/modules/conf_comp/e_mod_config.c:575
 #: src/modules/conf_performance/e_int_config_performance.c:122
 #: src/modules/everything/evry_config.c:378
 #: src/modules/everything/evry_plug_files.c:1477
@@ -1167,7 +3208,7 @@ msgstr "在终端中运行"
 msgid "Show in Menus"
 msgstr "显示在菜单中"
 
-#: src/bin/e_desktop_editor.c:787 src/bin/e_fm.c:8801 src/bin/e_fm.c:8961
+#: src/bin/e_desktop_editor.c:787 src/bin/e_fm.c:8822 src/bin/e_fm.c:8982
 #: src/bin/e_int_border_remember.c:818
 #: src/modules/xkbswitch/e_mod_config.c:316
 msgid "Options"
@@ -1182,18 +3223,19 @@ msgstr "为 %s 选择一个图标"
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
-#: src/bin/e_entry.c:478 src/bin/e_fm.c:9146 src/bin/e_fm.c:10816
-#: src/bin/e_shelf.c:1661 src/bin/e_shelf.c:2319
-#: src/modules/conf_dialogs/e_int_config_profiles.c:135
-#: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_bindings/e_int_config_edgebindings.c:269
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:776
+#: src/bin/e_entry.c:478 src/bin/e_fm.c:9167 src/bin/e_fm.c:10837
+#: src/bin/e_shelf.c:1659 src/bin/e_shelf.c:2317
 #: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:269
 #: src/modules/conf_bindings/e_int_config_keybindings.c:247
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:776
+#: src/modules/conf_dialogs/e_int_config_profiles.c:135
+#: src/modules/conf_dialogs/e_int_config_profiles.c:339
 #: src/modules/conf_paths/e_int_config_env.c:317
-#: src/modules/conf_shelves/e_int_config_shelf.c:137
-#: src/modules/conf_shelves/e_int_config_shelf.c:392
+#: src/modules/conf_shelves/e_int_config_shelf.c:139
+#: src/modules/conf_shelves/e_int_config_shelf.c:394
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1281
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:187
 #: src/modules/ibar/e_mod_config.c:112 src/modules/ibar/e_mod_config.c:199
 #: src/modules/quickaccess/e_mod_config.c:277
@@ -1201,15 +3243,15 @@ msgstr "选择一个可执行文件"
 msgid "Delete"
 msgstr "删除"
 
-#: src/bin/e_entry.c:488 src/bin/e_fm.c:9057
+#: src/bin/e_entry.c:488 src/bin/e_fm.c:9078
 msgid "Cut"
 msgstr "剪切"
 
-#: src/bin/e_entry.c:497 src/bin/e_fm.c:9071 src/bin/e_fm.c:11578
+#: src/bin/e_entry.c:497 src/bin/e_fm.c:9092 src/bin/e_fm.c:11599
 msgid "Copy"
 msgstr "复制"
 
-#: src/bin/e_entry.c:507 src/bin/e_fm.c:8862 src/bin/e_fm.c:9084
+#: src/bin/e_entry.c:507 src/bin/e_fm.c:8883 src/bin/e_fm.c:9105
 msgid "Paste"
 msgstr "粘贴"
 
@@ -1397,296 +3439,297 @@ msgstr "弹出错误"
 msgid "Can't eject device"
 msgstr "无法弹出设备"
 
-#: src/bin/e_fm.c:6602 src/bin/e_fm.c:6635 src/bin/e_fm.c:9528
-#: src/bin/e_fm.c:9540 src/bin/e_fm.c:9644 src/bin/e_fm.c:9649
-#: src/bin/e_fm.c:9665 src/bin/e_fm.c:9670 src/bin/e_fm.c:10296
-#: src/bin/e_fm.c:10300 src/bin/e_fm.c:10304 src/bin/e_fm.c:10332
-#: src/bin/e_fm.c:10337 src/bin/e_fm.c:10341 src/bin/e_fm.c:10400
-#: src/bin/e_fm.c:10624 src/bin/e_fm_prop.c:254 src/bin/e_shelf.c:2187
+#: src/bin/e_fm.c:6628 src/bin/e_fm.c:6661 src/bin/e_fm.c:9549
+#: src/bin/e_fm.c:9561 src/bin/e_fm.c:9665 src/bin/e_fm.c:9670
+#: src/bin/e_fm.c:9686 src/bin/e_fm.c:9691 src/bin/e_fm.c:10317
+#: src/bin/e_fm.c:10321 src/bin/e_fm.c:10325 src/bin/e_fm.c:10353
+#: src/bin/e_fm.c:10358 src/bin/e_fm.c:10362 src/bin/e_fm.c:10421
+#: src/bin/e_fm.c:10645 src/bin/e_fm_prop.c:254 src/bin/e_shelf.c:2185
+#: src/modules/conf/e_mod_main.c:269 src/modules/conf2/e_mod_main.c:300
 msgid "Error"
 msgstr "错误"
 
-#: src/bin/e_fm.c:6602 src/bin/e_fm.c:6635
+#: src/bin/e_fm.c:6628 src/bin/e_fm.c:6661
 #, c-format
 msgid "The recent DND operation requested for '%s' has failed."
 msgstr ""
 
-#: src/bin/e_fm.c:8719 src/modules/fileman/e_mod_config.c:360
+#: src/bin/e_fm.c:8740 src/modules/fileman/e_mod_config.c:360
 msgid "Case Sensitive"
 msgstr "区分大小写"
 
-#: src/bin/e_fm.c:8725 src/modules/fileman/e_mod_config.c:363
+#: src/bin/e_fm.c:8746 src/modules/fileman/e_mod_config.c:363
 msgid "Sort By Extension"
 msgstr "按扩展名排序"
 
-#: src/bin/e_fm.c:8731 src/modules/fileman/e_mod_config.c:366
+#: src/bin/e_fm.c:8752 src/modules/fileman/e_mod_config.c:366
 msgid "Sort By Modification Time"
 msgstr "按修改时间排序"
 
-#: src/bin/e_fm.c:8737 src/modules/fileman/e_mod_config.c:369
+#: src/bin/e_fm.c:8758 src/modules/fileman/e_mod_config.c:369
 msgid "Sort By Size"
 msgstr "按大小排序"
 
-#: src/bin/e_fm.c:8746 src/modules/fileman/e_mod_config.c:377
+#: src/bin/e_fm.c:8767 src/modules/fileman/e_mod_config.c:377
 msgid "Directories First"
 msgstr "目录优先"
 
-#: src/bin/e_fm.c:8752 src/modules/fileman/e_mod_config.c:381
+#: src/bin/e_fm.c:8773 src/modules/fileman/e_mod_config.c:381
 msgid "Directories Last"
 msgstr "目录置后"
 
-#: src/bin/e_fm.c:8785 src/bin/e_fm.c:8945
+#: src/bin/e_fm.c:8806 src/bin/e_fm.c:8966
 #: src/modules/fileman/e_mod_config.c:305
 msgid "View Mode"
 msgstr "显示模式"
 
-#: src/bin/e_fm.c:8794 src/bin/e_fm.c:8954
+#: src/bin/e_fm.c:8815 src/bin/e_fm.c:8975
 #: src/modules/everything/evry_config.c:503
 #: src/modules/fileman/e_mod_config.c:385
 msgid "Sorting"
 msgstr "排序"
 
-#: src/bin/e_fm.c:8812 src/bin/e_fm.c:8972
+#: src/bin/e_fm.c:8833 src/bin/e_fm.c:8993
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: src/bin/e_fm.c:8823 src/bin/e_fm.c:8984
+#: src/bin/e_fm.c:8844 src/bin/e_fm.c:9005
 msgid "New..."
 msgstr "新建..."
 
-#: src/bin/e_fm.c:8843 src/bin/e_fm.c:9005 src/bin/e_fm.c:9036
+#: src/bin/e_fm.c:8864 src/bin/e_fm.c:9026 src/bin/e_fm.c:9057
 msgid "Actions..."
 msgstr "动作..."
 
-#: src/bin/e_fm.c:8870 src/bin/e_fm.c:9092 src/bin/e_fm.c:11591
+#: src/bin/e_fm.c:8891 src/bin/e_fm.c:9113 src/bin/e_fm.c:11612
 msgid "Link"
 msgstr "连接"
 
-#: src/bin/e_fm.c:9154 src/bin/e_fm.c:10453 src/bin/e_shelf.c:2314
-#: src/modules/conf_shelves/e_int_config_shelf.c:140
+#: src/bin/e_fm.c:9175 src/bin/e_fm.c:10474 src/bin/e_shelf.c:2312
+#: src/modules/conf_shelves/e_int_config_shelf.c:142
 #: src/modules/quickaccess/e_mod_config.c:226
 #: src/modules/quickaccess/e_mod_config.c:274
 #: src/modules/quickaccess/e_mod_config.c:304
 msgid "Rename"
 msgstr "重命名"
 
-#: src/bin/e_fm.c:9173
+#: src/bin/e_fm.c:9194
 msgid "Unmount"
 msgstr "卸载"
 
-#: src/bin/e_fm.c:9178
+#: src/bin/e_fm.c:9199
 msgid "Mount"
 msgstr "挂载"
 
-#: src/bin/e_fm.c:9183
+#: src/bin/e_fm.c:9204
 msgid "Eject"
 msgstr "弹出"
 
-#: src/bin/e_fm.c:9197 src/bin/e_int_border_remember.c:796
+#: src/bin/e_fm.c:9218 src/bin/e_int_border_remember.c:796
 #: src/modules/ibar/e_mod_main.c:883
 msgid "Properties"
 msgstr "属性"
 
-#: src/bin/e_fm.c:9205
+#: src/bin/e_fm.c:9226
 msgid "Application Properties"
 msgstr "应用程序属性"
 
-#: src/bin/e_fm.c:9213 src/bin/e_fm_prop.c:115
+#: src/bin/e_fm.c:9234 src/bin/e_fm_prop.c:115
 msgid "File Properties"
 msgstr "文件属性"
 
-#: src/bin/e_fm.c:9429
+#: src/bin/e_fm.c:9450
 msgid "Use default"
 msgstr "使用默认"
 
-#: src/bin/e_fm.c:9458 src/modules/fileman/e_mod_config.c:310
+#: src/bin/e_fm.c:9479 src/modules/fileman/e_mod_config.c:310
 msgid "Grid Icons"
 msgstr "网格图标"
 
-#: src/bin/e_fm.c:9466 src/modules/fileman/e_mod_config.c:312
+#: src/bin/e_fm.c:9487 src/modules/fileman/e_mod_config.c:312
 msgid "Custom Icons"
 msgstr "自定义图标"
 
-#: src/bin/e_fm.c:9474 src/modules/everything/evry_config.c:430
+#: src/bin/e_fm.c:9495 src/modules/everything/evry_config.c:430
 #: src/modules/everything/evry_config.c:460
 #: src/modules/fileman/e_mod_config.c:320
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:9482 src/modules/everything/evry_config.c:458
+#: src/bin/e_fm.c:9503 src/modules/everything/evry_config.c:458
 msgid "Default View"
 msgstr "默认查看器"
 
-#: src/bin/e_fm.c:9503
+#: src/bin/e_fm.c:9524
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "图标大小  (%d)"
 
-#: src/bin/e_fm.c:9528
+#: src/bin/e_fm.c:9549
 msgid "Could not create a directory!"
 msgstr "无法创建目录！"
 
-#: src/bin/e_fm.c:9540
+#: src/bin/e_fm.c:9561
 msgid "Could not create a file!"
 msgstr "无法创建文件！"
 
-#: src/bin/e_fm.c:9554 src/bin/e_fm.c:9579
+#: src/bin/e_fm.c:9575 src/bin/e_fm.c:9600
 #: src/modules/conf_paths/e_int_config_paths.c:206
 msgid "New Directory"
 msgstr "新建目录"
 
-#: src/bin/e_fm.c:9554 src/bin/e_fm.c:9579
+#: src/bin/e_fm.c:9575 src/bin/e_fm.c:9600
 msgid "New File"
 msgstr "新建文件"
 
-#: src/bin/e_fm.c:9644 src/bin/e_fm.c:9665
+#: src/bin/e_fm.c:9665 src/bin/e_fm.c:9686
 msgid "Already creating a new file for this directory!"
 msgstr "已经在此目录中创建了一个新的文件。"
 
-#: src/bin/e_fm.c:9649 src/bin/e_fm.c:9670
+#: src/bin/e_fm.c:9670 src/bin/e_fm.c:9691
 #, c-format
 msgid "%s can't be written to!"
 msgstr "不能写入 %s ！"
 
-#: src/bin/e_fm.c:9689
+#: src/bin/e_fm.c:9710
 msgid "Directory"
 msgstr "目录"
 
-#: src/bin/e_fm.c:9694
+#: src/bin/e_fm.c:9715
 #: src/modules/conf_applications/e_int_config_defapps.c:312
 msgid "File"
 msgstr "文件"
 
-#: src/bin/e_fm.c:9725
+#: src/bin/e_fm.c:9746
 msgid "Inherit parent settings"
 msgstr "继承上一级设定"
 
-#: src/bin/e_fm.c:9734
+#: src/bin/e_fm.c:9755
 msgid "Show Hidden Files"
 msgstr "显示隐藏文件"
 
-#: src/bin/e_fm.c:9746
+#: src/bin/e_fm.c:9767
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: src/bin/e_fm.c:9755
+#: src/bin/e_fm.c:9776
 msgid "Sort Now"
 msgstr "现在排序"
 
-#: src/bin/e_fm.c:9763
+#: src/bin/e_fm.c:9784
 msgid "Single Click Activation"
 msgstr "启用单击"
 
-#: src/bin/e_fm.c:9774 src/modules/fileman/e_mod_config.c:397
+#: src/bin/e_fm.c:9795 src/modules/fileman/e_mod_config.c:397
 msgid "Secure Deletion"
 msgstr "安全删除"
 
-#: src/bin/e_fm.c:9787 src/modules/fileman/e_mod_config.c:122
+#: src/bin/e_fm.c:9808 src/modules/fileman/e_mod_config.c:122
 msgid "File Manager Settings"
 msgstr "文件管理器设置"
 
-#: src/bin/e_fm.c:9792
+#: src/bin/e_fm.c:9813
 msgid "File Icon Settings"
 msgstr "文件图标设置"
 
-#: src/bin/e_fm.c:9869 src/bin/e_fm.c:10085
+#: src/bin/e_fm.c:9890 src/bin/e_fm.c:10106
 msgid "Set background..."
 msgstr "设置背景..."
 
-#: src/bin/e_fm.c:9877
+#: src/bin/e_fm.c:9898
 msgid "Clear background"
 msgstr "清除背景"
 
-#: src/bin/e_fm.c:9884 src/bin/e_fm.c:10113
+#: src/bin/e_fm.c:9905 src/bin/e_fm.c:10134
 msgid "Set overlay..."
 msgstr "设定覆盖..."
 
-#: src/bin/e_fm.c:9890
+#: src/bin/e_fm.c:9911
 msgid "Clear overlay"
 msgstr "设定覆盖"
 
-#: src/bin/e_fm.c:10207 src/bin/e_fm.c:10548
+#: src/bin/e_fm.c:10228 src/bin/e_fm.c:10569
 #, c-format
 msgid "Rename %s to:"
 msgstr "重命名 %s 为："
 
-#: src/bin/e_fm.c:10209 src/bin/e_fm.c:10549
+#: src/bin/e_fm.c:10230 src/bin/e_fm.c:10570
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: src/bin/e_fm.c:10296 src/bin/e_fm.c:10332
+#: src/bin/e_fm.c:10317 src/bin/e_fm.c:10353
 #, c-format
 msgid "%s already exists!"
 msgstr "%s 已存在！"
 
-#: src/bin/e_fm.c:10300 src/bin/e_fm.c:10337
+#: src/bin/e_fm.c:10321 src/bin/e_fm.c:10358
 #, c-format
 msgid "%s could not be renamed because it is protected"
 msgstr "%s 无法重命名，因为它是受保护的"
 
-#: src/bin/e_fm.c:10304 src/bin/e_fm.c:10341
+#: src/bin/e_fm.c:10325 src/bin/e_fm.c:10362
 msgid "Internal filemanager error :("
 msgstr "内部文件管理器错误 :("
 
-#: src/bin/e_fm.c:10396 src/bin/e_fm.c:10616
+#: src/bin/e_fm.c:10417 src/bin/e_fm.c:10637
 msgid "Retry"
 msgstr "重试"
 
-#: src/bin/e_fm.c:10397 src/bin/e_fm.c:10617 src/bin/e_fm.c:11599
+#: src/bin/e_fm.c:10418 src/bin/e_fm.c:10638 src/bin/e_fm.c:11620
 msgid "Abort"
 msgstr "关于"
 
-#: src/bin/e_fm.c:10452
+#: src/bin/e_fm.c:10473
 msgid "No to all"
 msgstr "全部选否"
 
-#: src/bin/e_fm.c:10455
+#: src/bin/e_fm.c:10476
 msgid "Yes to all"
 msgstr "全部选是"
 
-#: src/bin/e_fm.c:10458
+#: src/bin/e_fm.c:10479
 msgid "Warning"
 msgstr "警告"
 
-#: src/bin/e_fm.c:10461
+#: src/bin/e_fm.c:10482
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "文件已经存在，覆盖吗？<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:10619
+#: src/bin/e_fm.c:10640
 msgid "Move Source"
 msgstr "移动源"
 
-#: src/bin/e_fm.c:10620
+#: src/bin/e_fm.c:10641
 msgid "Ignore this"
 msgstr "忽略"
 
-#: src/bin/e_fm.c:10621
+#: src/bin/e_fm.c:10642
 msgid "Ignore all"
 msgstr "忽略所有"
 
-#: src/bin/e_fm.c:10626
+#: src/bin/e_fm.c:10647
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "执行操作时产生一个错误。<br>%s"
 
-#: src/bin/e_fm.c:10819
+#: src/bin/e_fm.c:10840
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: src/bin/e_fm.c:10829
+#: src/bin/e_fm.c:10850
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight>?"
 msgstr "您确定要删除 <br><hilight>%s</hilight> 吗？"
 
-#: src/bin/e_fm.c:10834
+#: src/bin/e_fm.c:10855
 #, 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:10844
+#: src/bin/e_fm.c:10865
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected file in<br><hilight>%s</"
@@ -1726,7 +3769,7 @@ msgstr "可移动设备"
 msgid "Cannot change permissions: %s"
 msgstr "无法更改权限: %s"
 
-#: src/bin/e_fm_prop.c:390 src/bin/e_shelf.c:1000 src/bin/e_shelf.c:2207
+#: src/bin/e_fm_prop.c:390 src/bin/e_shelf.c:998 src/bin/e_shelf.c:2205
 #: src/modules/conf_dialogs/e_int_config_profiles.c:316
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:147
 msgid "Name:"
@@ -1785,15 +3828,8 @@ msgstr "组："
 msgid "Others:"
 msgstr "其它："
 
-#: src/bin/e_fm_prop.c:480 src/bin/e_import_config_dialog.c:476
-#: 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:439
-msgid "Preview"
-msgstr "预览"
-
-#: src/bin/e_fm_prop.c:527 src/modules/everything/evry_config.c:426
+#: src/bin/e_fm_prop.c:527 src/modules/bluez4/e_mod_main.c:198
+#: src/modules/everything/evry_config.c:426
 msgid "Default"
 msgstr "默认"
 
@@ -1831,7 +3867,7 @@ msgstr "组件出错"
 msgid "%s does not support disabling autoscrolling"
 msgstr "%s 不支持禁用自动滚动"
 
-#: src/bin/e_gadcon.c:1682 src/bin/e_int_border_menu.c:140
+#: src/bin/e_gadcon.c:1682 src/bin/e_int_border_menu.c:139
 msgid "Move to"
 msgstr "移动到"
 
@@ -1849,7 +3885,9 @@ msgstr "插入"
 
 #: src/bin/e_gadcon.c:1789 src/bin/e_int_config_modules.c:53
 #: src/modules/conf_comp/e_mod_main.c:231
-#: src/modules/conf_theme/e_mod_main.c:123 src/modules/physics/e_mod_main.c:45
+#: src/modules/conf_theme/e_mod_main.c:123
+#: src/modules/conf_wallpaper2/e_mod_main.c:22
+#: src/modules/physics/e_mod_main.c:45
 msgid "Look"
 msgstr "外观"
 
@@ -1909,88 +3947,88 @@ msgstr ""
 "已经有 Enlightenment 实例在此屏幕运行，\n"
 "中止启动。\n"
 
+#: src/bin/e_import_config_dialog.c:288
+msgid "Picture Import Error"
+msgstr "图像导入出错"
+
+#: src/bin/e_import_config_dialog.c:289
+msgid ""
+"Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr "Elightenment 无法导入该图像，<br>转换错误。"
+
+#: src/bin/e_import_config_dialog.c:345 src/bin/e_import_config_dialog.c:355
 #: src/bin/e_import_dialog.c:74 src/bin/e_import_dialog.c:84
-#: src/bin/e_import_config_dialog.c:351 src/bin/e_import_config_dialog.c:361
 msgid "Import Error"
 msgstr "导入出错"
 
-#: src/bin/e_import_dialog.c:75 src/bin/e_import_config_dialog.c:352
+#: src/bin/e_import_config_dialog.c:346 src/bin/e_import_dialog.c:75
 msgid "Enlightenment was unable to import the image<br>due to a copy error."
 msgstr "Elightenment 无法导入该图像，<br>复制错误。"
 
-#: src/bin/e_import_dialog.c:85 src/bin/e_import_config_dialog.c:362
+#: src/bin/e_import_config_dialog.c:356 src/bin/e_import_dialog.c:85
 msgid ""
 "Enlightenment was unable to import the image.<br><br>Are you sure this is a "
 "valid image?"
 msgstr "Elightenment 无法导入该图像。<br><br>您确定那是一个有效的图像吗？"
 
-#: src/bin/e_import_dialog.c:162
-msgid "Select a Picture..."
-msgstr "选择一个图像..."
-
-#: src/bin/e_import_dialog.c:194
-msgid "Use"
-msgstr "使用"
-
-#: src/bin/e_import_config_dialog.c:294
-msgid "Picture Import Error"
-msgstr "图像导入出错"
-
-#: src/bin/e_import_config_dialog.c:295
-msgid ""
-"Enlightenment was unable to import the picture<br>due to conversion errors."
-msgstr "Elightenment 无法导入该图像，<br>转换错误。"
-
-#: src/bin/e_import_config_dialog.c:458
+#: src/bin/e_import_config_dialog.c:452
 msgid "Import Settings..."
 msgstr "导入设置..."
 
-#: src/bin/e_import_config_dialog.c:490
+#: src/bin/e_import_config_dialog.c:484
 msgid "Fill and Stretch Options"
 msgstr "填充和拉伸选项"
 
-#: src/bin/e_import_config_dialog.c:492
+#: src/bin/e_import_config_dialog.c:486
 msgid "Stretch"
 msgstr "拉伸"
 
-#: src/bin/e_import_config_dialog.c:496 src/bin/e_int_border_prop.c:236
+#: src/bin/e_import_config_dialog.c:490 src/bin/e_int_border_prop.c:236
 #, c-format
 msgid "Center"
 msgstr "居中"
 
-#: src/bin/e_import_config_dialog.c:500
+#: src/bin/e_import_config_dialog.c:494
 msgid "Tile"
 msgstr "平铺"
 
-#: src/bin/e_import_config_dialog.c:505
+#: src/bin/e_import_config_dialog.c:499
 msgid "Within"
 msgstr ""
 
-#: src/bin/e_import_config_dialog.c:509
+#: src/bin/e_import_config_dialog.c:503
 msgid "Fill"
 msgstr "填充"
 
-#: src/bin/e_import_config_dialog.c:513
+#: src/bin/e_import_config_dialog.c:507
 msgid "Pan"
 msgstr ""
 
-#: src/bin/e_import_config_dialog.c:521
+#: src/bin/e_import_config_dialog.c:515
 msgid "File Quality"
 msgstr "文件质量"
 
-#: src/bin/e_import_config_dialog.c:522
+#: src/bin/e_import_config_dialog.c:516
 msgid "Use original file"
 msgstr "使用原始文件"
 
-#: src/bin/e_import_config_dialog.c:524
+#: src/bin/e_import_config_dialog.c:518
 #, c-format
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/bin/e_import_config_dialog.c:529
+#: src/bin/e_import_config_dialog.c:523
 msgid "Fill Color"
 msgstr "填充颜色"
 
+#: src/bin/e_import_dialog.c:162
+msgid "Select a Picture..."
+msgstr "选择一个图像..."
+
+#: src/bin/e_import_dialog.c:194
+msgid "Use"
+msgstr "使用"
+
 #: src/bin/e_int_border_locks.c:66
 msgid "Window Locks"
 msgstr "窗口锁"
@@ -2037,7 +4075,7 @@ msgid "Size"
 msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:697 src/bin/e_int_border_prop.c:501
+#: src/bin/e_int_border_menu.c:696 src/bin/e_int_border_prop.c:501
 #: src/bin/e_int_border_remember.c:748 src/bin/e_int_shelf_config.c:149
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:302
 msgid "Stacking"
@@ -2098,85 +4136,85 @@ msgstr "行为锁"
 msgid "Remember these Locks"
 msgstr "记住这些行为锁"
 
-#: src/bin/e_int_border_menu.c:127
+#: src/bin/e_int_border_menu.c:126
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "窗口"
 
-#: src/bin/e_int_border_menu.c:149 src/bin/e_int_border_menu.c:1012
+#: src/bin/e_int_border_menu.c:148 src/bin/e_int_border_menu.c:1024
 msgid "Always on Top"
 msgstr "总在上面"
 
-#: src/bin/e_int_border_menu.c:164 src/bin/e_int_border_prop.c:506
+#: src/bin/e_int_border_menu.c:163 src/bin/e_int_border_prop.c:506
 msgid "Sticky"
 msgstr "粘住"
 
-#: src/bin/e_int_border_menu.c:178
+#: src/bin/e_int_border_menu.c:177
 msgid "Shade"
 msgstr "卷起"
 
-#: src/bin/e_int_border_menu.c:371 src/bin/e_int_border_prop.c:511
+#: src/bin/e_int_border_menu.c:370 src/bin/e_int_border_prop.c:511
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:207
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: src/bin/e_int_border_menu.c:439
+#: src/bin/e_int_border_menu.c:438
 msgid "Unmaximize"
 msgstr "还原"
 
-#: src/bin/e_int_border_menu.c:581
+#: src/bin/e_int_border_menu.c:580
 msgid "Edit Icon"
 msgstr "编辑图标"
 
-#: src/bin/e_int_border_menu.c:589
+#: src/bin/e_int_border_menu.c:588
 msgid "Create Icon"
 msgstr "创建图标"
 
-#: src/bin/e_int_border_menu.c:597
+#: src/bin/e_int_border_menu.c:596
 msgid "Add to Favorites Menu"
 msgstr "添加到收藏菜单"
 
-#: src/bin/e_int_border_menu.c:602
+#: src/bin/e_int_border_menu.c:601
 msgid "Add to IBar"
 msgstr "添加到 IBar"
 
-#: src/bin/e_int_border_menu.c:610
+#: src/bin/e_int_border_menu.c:609
 msgid "Create Keyboard Shortcut"
 msgstr "创建快捷键"
 
-#: src/bin/e_int_border_menu.c:656
+#: src/bin/e_int_border_menu.c:655
 #: src/modules/everything/evry_plug_windows.c:438
 msgid "Iconify"
 msgstr "最小化"
 
-#: src/bin/e_int_border_menu.c:706
+#: src/bin/e_int_border_menu.c:705
 msgid "Skip"
 msgstr "跳过"
 
-#: src/bin/e_int_border_menu.c:716 src/modules/conf_theme/e_mod_main.c:120
+#: src/bin/e_int_border_menu.c:715 src/modules/conf_theme/e_mod_main.c:120
 msgid "Border"
 msgstr "边框"
 
-#: src/bin/e_int_border_menu.c:728 src/bin/e_int_border_remember.c:652
+#: src/bin/e_int_border_menu.c:727 src/bin/e_int_border_remember.c:652
 #: src/bin/e_int_border_remember.c:751
 msgid "Locks"
 msgstr "锁定"
 
-#: src/bin/e_int_border_menu.c:736
+#: src/bin/e_int_border_menu.c:735
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "记住"
 
-#: src/bin/e_int_border_menu.c:758
+#: src/bin/e_int_border_menu.c:757
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:932
+#: src/bin/e_int_border_menu.c:933
 #, c-format
 msgid "Screen %d"
 msgstr "屏幕 %d"
 
-#: src/bin/e_int_border_menu.c:1023 src/bin/e_int_border_prop.c:157
+#: src/bin/e_int_border_menu.c:1035 src/bin/e_int_border_prop.c:157
 #: src/bin/e_int_border_prop.c:179
 #: src/modules/conf_theme/e_int_config_fonts.c:100
 #: src/modules/conf_theme/e_int_config_fonts.c:264
@@ -2185,51 +4223,51 @@ msgstr "屏幕 %d"
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:1034
+#: src/bin/e_int_border_menu.c:1046
 msgid "Always Below"
 msgstr "置底"
 
-#: src/bin/e_int_border_menu.c:1078
+#: src/bin/e_int_border_menu.c:1090
 msgid "Pin to Desktop"
 msgstr "固定到桌面"
 
-#: src/bin/e_int_border_menu.c:1089
+#: src/bin/e_int_border_menu.c:1101
 msgid "Unpin from Desktop"
 msgstr "解除固定"
 
-#: src/bin/e_int_border_menu.c:1179
+#: src/bin/e_int_border_menu.c:1191
 msgid "Select Border Style"
 msgstr "选择边框样式"
 
-#: src/bin/e_int_border_menu.c:1191
+#: src/bin/e_int_border_menu.c:1203
 msgid "Use Enlightenment Default Icon Preference"
 msgstr "使用 Enlightenment 默认图标选项"
 
-#: src/bin/e_int_border_menu.c:1199
+#: src/bin/e_int_border_menu.c:1211
 msgid "Use Application Provided Icon"
 msgstr "使用应用程序提供的图标 "
 
-#: src/bin/e_int_border_menu.c:1207
+#: src/bin/e_int_border_menu.c:1219
 msgid "Use User Defined Icon"
 msgstr "使用用户自定义图标"
 
-#: src/bin/e_int_border_menu.c:1216 src/bin/e_int_border_remember.c:784
+#: src/bin/e_int_border_menu.c:1228 src/bin/e_int_border_remember.c:784
 msgid "Offer Resistance"
 msgstr "阻抗"
 
-#: src/bin/e_int_border_menu.c:1277
+#: src/bin/e_int_border_menu.c:1289
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:1287 src/modules/pager/e_mod_main.c:265
-#: src/modules/pager/e_mod_main.c:2922 src/modules/pager/e_mod_main.c:2929
-#: 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/modules/pager/e_mod_main.c:2942
-#: src/modules/pager/e_mod_main.c:2944 src/modules/pager/e_mod_main.c:2946
+#: src/bin/e_int_border_menu.c:1299 src/modules/pager/e_mod_main.c:265
+#: src/modules/pager/e_mod_main.c:2924 src/modules/pager/e_mod_main.c:2931
+#: src/modules/pager/e_mod_main.c:2938 src/modules/pager/e_mod_main.c:2940
+#: src/modules/pager/e_mod_main.c:2942 src/modules/pager/e_mod_main.c:2944
+#: src/modules/pager/e_mod_main.c:2946 src/modules/pager/e_mod_main.c:2948
 msgid "Pager"
 msgstr "分页器"
 
-#: src/bin/e_int_border_menu.c:1297 src/modules/wizard/page_180.c:24
+#: src/bin/e_int_border_menu.c:1309 src/modules/wizard/page_180.c:24
 msgid "Taskbar"
 msgstr "任务栏"
 
@@ -2316,20 +4354,6 @@ msgstr "东南"
 msgid "Static"
 msgstr "静态"
 
-#: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
-#: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
-#: src/modules/conf_performance/e_int_config_powermanagement.c:196
-#: src/modules/conf_theme/e_int_config_fonts.c:689
-#: src/modules/conf_theme/e_int_config_transitions.c:199
-#: src/modules/conf_theme/e_int_config_transitions.c:257
-#: src/modules/conf_theme/e_int_config_transitions.c:289
-#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:116
-#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:129
-#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:143
-msgid "None"
-msgstr "无"
-
 #: src/bin/e_int_border_prop.c:302
 msgid "Above"
 msgstr ""
@@ -2354,11 +4378,6 @@ msgstr "NetWM 属性"
 msgid "ICCCM"
 msgstr "ICCCM"
 
-#: src/bin/e_int_border_prop.c:444 src/bin/e_int_border_remember.c:698
-#: src/modules/conf_comp/e_mod_main.c:177 src/modules/wizard/page_050.c:95
-msgid "Title"
-msgstr "标题"
-
 #: src/bin/e_int_border_prop.c:446
 msgid "Class"
 msgstr "类别"
@@ -2453,20 +4472,23 @@ msgstr "请求位置"
 
 #: src/bin/e_int_border_prop.c:477 src/bin/e_int_border_prop.c:512
 #: src/bin/e_int_config_modules.c:58 src/bin/e_int_menus.c:272
-#: src/bin/e_shelf.c:2285 src/modules/backlight/e_mod_main.c:254
+#: src/bin/e_shelf.c:2283 src/modules/backlight/e_mod_main.c:254
 #: src/modules/battery/e_mod_main.c:188 src/modules/clock/e_mod_main.c:374
-#: src/modules/clock/e_mod_main.c:617 src/modules/conf_dialogs/e_mod_main.c:17
+#: src/modules/clock/e_mod_main.c:617 src/modules/conf/e_conf.c:136
+#: src/modules/conf/e_conf.c:146 src/modules/conf/e_mod_main.c:101
+#: src/modules/conf2/e_mod_main.c:95 src/modules/conf_dialogs/e_mod_main.c:17
 #: src/modules/conf_interaction/e_int_config_mouse.c:155
-#: src/modules/conf_shelves/e_int_config_shelf.c:147
-#: src/modules/everything/evry_gadget.c:511
-#: src/modules/everything/evry_gadget.c:695
+#: src/modules/conf_shelves/e_int_config_shelf.c:149
+#: src/modules/connman/e_mod_main.c:416
+#: src/modules/everything/evry_gadget.c:490
+#: src/modules/everything/evry_gadget.c:674
 #: src/modules/everything/evry_plug_settings.c:183
 #: src/modules/ibar/e_mod_main.c:400 src/modules/ibar/e_mod_main.c:876
 #: src/modules/ibox/e_mod_main.c:302 src/modules/ibox/e_mod_main.c:678
-#: src/modules/pager/e_mod_main.c:878 src/modules/temperature/e_mod_main.c:230
-#: src/modules/wizard/page_150.c:67 src/modules/mixer/e_mod_main.c:724
-#: src/modules/music-control/ui.c:225 src/modules/connman/e_mod_main.c:416
-#: src/modules/tasks/e_mod_main.c:728 src/modules/xkbswitch/e_mod_main.c:335
+#: src/modules/mixer/e_mod_main.c:651 src/modules/music-control/ui.c:225
+#: src/modules/pager/e_mod_main.c:878 src/modules/tasks/e_mod_main.c:728
+#: src/modules/temperature/e_mod_main.c:230 src/modules/wizard/page_150.c:67
+#: src/modules/xkbswitch/e_mod_main.c:335
 #: src/modules/xkbswitch/e_mod_main.c:369
 msgid "Settings"
 msgstr "设置"
@@ -2489,10 +4511,6 @@ msgstr "跳过任务栏"
 msgid "Skip Pager"
 msgstr "跳过分页器"
 
-#: src/bin/e_int_border_prop.c:510 src/modules/conf_comp/e_mod_main.c:70
-msgid "Hidden"
-msgstr "隐藏"
-
 #: src/bin/e_int_border_remember.c:85 src/bin/e_int_border_remember.c:110
 msgid "Window Remember"
 msgstr "窗口记忆"
@@ -2549,10 +4567,10 @@ msgstr "尺寸和位置"
 msgid "Size, Position and Locks"
 msgstr "尺寸、位置和锁定"
 
-#: src/bin/e_int_border_remember.c:656
-#: src/modules/everything/evry_gadget.c:644
+#: src/bin/e_int_border_remember.c:656 src/modules/conf/e_mod_main.c:252
+#: src/modules/conf2/e_mod_main.c:247 src/modules/everything/evry_gadget.c:623
 #: src/modules/everything/evry_plug_aggregator.c:313
-#: src/modules/everything/evry_view.c:1618 src/modules/shot/e_mod_main.c:747
+#: src/modules/everything/evry_view.c:1618 src/modules/shot/e_mod_main.c:744
 msgid "All"
 msgstr "全部"
 
@@ -2680,14 +4698,15 @@ msgstr "加载组件"
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_applications/e_int_config_apps.c:290
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
-#: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:773
 #: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
 #: src/modules/conf_bindings/e_int_config_keybindings.c:244
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:773
+#: src/modules/conf_dialogs/e_int_config_profiles.c:133
 #: src/modules/conf_paths/e_int_config_env.c:311
-#: src/modules/conf_shelves/e_int_config_shelf.c:135
+#: src/modules/conf_shelves/e_int_config_shelf.c:137
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1276
 #: src/modules/ibar/e_mod_config.c:110
 #: src/modules/xkbswitch/e_mod_config.c:255
 msgid "Add"
@@ -2705,27 +4724,6 @@ msgstr "书架内容"
 msgid "Toolbar Contents"
 msgstr "工具条内容"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:353
-msgid "Toolbar Settings"
-msgstr "工具栏设定"
-
-#: src/bin/e_int_toolbar_config.c:81
-msgid "Layout"
-msgstr "布局"
-
-#: src/bin/e_intl.c:353
-msgid "Input Method Error"
-msgstr "输入法错误"
-
-#: src/bin/e_intl.c:354
-msgid ""
-"Error starting the input method executable<br><br>please make sure that your "
-"input<br>method configuration is correct and<br>that your "
-"configuration's<br>executable is in your PATH<br>"
-msgstr ""
-"启动输入法出现错误。<br><br>请确定您的输入法配置正确，<br>并且配置文件在 "
-"PATH 搜索路径里。<br>"
-
 #: src/bin/e_int_menus.c:135 src/modules/syscon/e_int_config_syscon.c:146
 msgid "Main"
 msgstr "主要"
@@ -2752,7 +4750,7 @@ msgstr "应用程序"
 #: 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
-#: src/modules/winlist/e_mod_main.c:27 src/modules/tiling/e_mod_tiling.c:3854
+#: src/modules/tiling/e_mod_tiling.c:3860 src/modules/winlist/e_mod_main.c:27
 msgid "Windows"
 msgstr "窗口"
 
@@ -2799,8 +4797,8 @@ msgstr "无窗口"
 msgid "Untitled window"
 msgstr "未命名的窗口"
 
-#: src/bin/e_int_menus.c:1717 src/bin/e_shelf.c:1505
-#: src/modules/conf_shelves/e_int_config_shelf.c:191
+#: src/bin/e_int_menus.c:1717 src/bin/e_shelf.c:1503
+#: src/modules/conf_shelves/e_int_config_shelf.c:193
 #, fuzzy, c-format
 msgid "Shelf %s"
 msgstr "书架 #"
@@ -2814,7 +4812,7 @@ msgid "Delete a Shelf"
 msgstr "删除书架"
 
 #: src/bin/e_int_shelf_config.c:44
-#: src/modules/conf_shelves/e_int_config_shelf.c:53
+#: src/modules/conf_shelves/e_int_config_shelf.c:55
 msgid "Shelf Settings"
 msgstr "书架设定"
 
@@ -2860,8 +4858,9 @@ msgstr "鼠标点击时显示"
 msgid "Hide timeout"
 msgstr "隐藏超时"
 
-#: src/bin/e_int_shelf_config.c:234 src/modules/notification/e_mod_main.c:244
+#: src/bin/e_int_shelf_config.c:234
 #: src/modules/notification/e_mod_config.c:115
+#: src/modules/notification/e_mod_main.c:266
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
@@ -2893,6 +4892,27 @@ msgstr "显示在所有桌面上"
 msgid "Show on specified Desktops"
 msgstr "在指定桌面显示"
 
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:353
+msgid "Toolbar Settings"
+msgstr "工具栏设定"
+
+#: src/bin/e_int_toolbar_config.c:81
+msgid "Layout"
+msgstr "布局"
+
+#: src/bin/e_intl.c:353
+msgid "Input Method Error"
+msgstr "输入法错误"
+
+#: src/bin/e_intl.c:354
+msgid ""
+"Error starting the input method executable<br><br>please make sure that your "
+"input<br>method configuration is correct and<br>that your "
+"configuration's<br>executable is in your PATH<br>"
+msgstr ""
+"启动输入法出现错误。<br><br>请确定您的输入法配置正确，<br>并且配置文件在 "
+"PATH 搜索路径里。<br>"
+
 #: src/bin/e_main.c:236
 msgid "Enlightenment cannot initialize Eina!\n"
 msgstr "Enlightenment 无法初始化 Eina!\n"
@@ -3058,19 +5078,7 @@ msgstr "Enlightenment 无法建立它的字体系统。\n"
 msgid "Enlightenment cannot set up its theme system.\n"
 msgstr "Enlightenment 无法建立它的主题系统。\n"
 
-#: src/bin/e_main.c:627
-msgid "Enlightenment cannot set up its init screen.\n"
-msgstr "Enlightenment 无法建立它的初始化屏幕。\n"
-
-#: src/bin/e_main.c:642
-msgid "Starting International Support"
-msgstr "开启国际化支持"
-
-#: src/bin/e_main.c:646
-msgid "Enlightenment cannot set up its intl system.\n"
-msgstr "Enlightenment 无法建立它的国际化系统。\n"
-
-#: src/bin/e_main.c:655
+#: src/bin/e_main.c:625
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you lack permissions on ~/.cache/efreet or are\n"
@@ -3080,19 +5088,19 @@ msgstr ""
 "可能是您没有 ~/.cache/efreet 的操作权限\n"
 "或者是内存溢出或磁盘空间问题？"
 
-#: src/bin/e_main.c:680
+#: src/bin/e_main.c:636
 msgid "Setup Actions"
 msgstr "设置动作"
 
-#: src/bin/e_main.c:684
+#: src/bin/e_main.c:640
 msgid "Enlightenment cannot set up its actions system.\n"
 msgstr "Enlightenment 无法建立它的动作系统。\n"
 
-#: src/bin/e_main.c:691
+#: src/bin/e_main.c:647
 msgid "Setup Screens"
 msgstr "设置屏幕"
 
-#: src/bin/e_main.c:695
+#: src/bin/e_main.c:651
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -3100,235 +5108,235 @@ msgstr ""
 "Enlightenment 在您的所有的屏幕上建立窗口管理失败。\n"
 "可能有另外一个窗口管理器在运行？\n"
 
-#: src/bin/e_main.c:703
+#: src/bin/e_main.c:663
+msgid "Enlightenment cannot set up its init screen.\n"
+msgstr "Enlightenment 无法建立它的初始化屏幕。\n"
+
+#: src/bin/e_main.c:677
+msgid "Starting International Support"
+msgstr "开启国际化支持"
+
+#: src/bin/e_main.c:681
+msgid "Enlightenment cannot set up its intl system.\n"
+msgstr "Enlightenment 无法建立它的国际化系统。\n"
+
+#: src/bin/e_main.c:702
 msgid "Setup ACPI"
 msgstr "设置 ACPI"
 
-#: src/bin/e_main.c:710
+#: src/bin/e_main.c:709
 msgid "Setup Backlight"
 msgstr "设置背光"
 
-#: src/bin/e_main.c:714
+#: src/bin/e_main.c:713
 msgid "Enlightenment cannot configure the backlight.\n"
 msgstr "Enlightenment 无法配置背光。\n"
 
-#: src/bin/e_main.c:721
+#: src/bin/e_main.c:720
 msgid "Setup Screensaver"
 msgstr "设置屏幕保护程序"
 
-#: src/bin/e_main.c:725
+#: src/bin/e_main.c:724
 msgid "Enlightenment cannot configure the X screensaver.\n"
 msgstr "Enlightenment 无法配置 X 屏幕保护程序。\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:731
 msgid "Setup DPMS"
 msgstr "设置 DPMS"
 
-#: src/bin/e_main.c:736
+#: src/bin/e_main.c:735
 msgid "Enlightenment cannot configure the DPMS settings.\n"
 msgstr "Enlightenment 无法配置它的 DPMS 设置。\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:742
 msgid "Setup Powersave Modes"
 msgstr "设置省电模式"
 
-#: src/bin/e_main.c:747
+#: src/bin/e_main.c:746
 msgid "Enlightenment cannot set up its powersave modes.\n"
 msgstr "Enlightenment 无法建立它的省电模式。\n"
 
-#: src/bin/e_main.c:754
+#: src/bin/e_main.c:753
 msgid "Setup Desklock"
 msgstr "设置桌面锁定"
 
-#: src/bin/e_main.c:758
+#: src/bin/e_main.c:757
 msgid "Enlightenment cannot set up its desk locking system.\n"
 msgstr "Enlightenment 无法建立它的桌面锁定系统。\n"
 
-#: src/bin/e_main.c:765
+#: src/bin/e_main.c:764
 msgid "Setup Popups"
 msgstr "设置弹出"
 
-#: src/bin/e_main.c:769
+#: src/bin/e_main.c:768
 msgid "Enlightenment cannot set up its popup system.\n"
 msgstr "Enlightenment 无法建立它的弹出系统。\n"
 
-#: src/bin/e_main.c:781
+#: src/bin/e_main.c:780
 msgid "Setup Message Bus"
 msgstr "设置消息总线"
 
-#: src/bin/e_main.c:788
+#: src/bin/e_main.c:787
 msgid "Setup Paths"
 msgstr "设置路径"
 
-#: src/bin/e_main.c:794
+#: src/bin/e_main.c:793
 msgid "Setup System Controls"
 msgstr "设置系统控制"
 
-#: src/bin/e_main.c:798
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment 无法初始化“系统命令”系统。\n"
 
-#: src/bin/e_main.c:805
+#: src/bin/e_main.c:804
 msgid "Setup Execution System"
 msgstr "设置运行系统"
 
-#: src/bin/e_main.c:809
+#: src/bin/e_main.c:808
 msgid "Enlightenment cannot set up its exec system.\n"
 msgstr "Enlightenment 无法建立它的 exec 系统。\n"
 
-#: src/bin/e_main.c:820
-msgid "Setup DND"
-msgstr "设置 DND"
-
-#: src/bin/e_main.c:824
-msgid "Enlightenment cannot set up its dnd system.\n"
-msgstr "Enlightenment 无法建立它的 DND 系统。\n"
-
-#: src/bin/e_main.c:831
+#: src/bin/e_main.c:819
 msgid "Setup Filemanager"
 msgstr "设置文件管理器"
 
-#: src/bin/e_main.c:835
+#: src/bin/e_main.c:823
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:842
+#: src/bin/e_main.c:830
 msgid "Setup Message System"
 msgstr "设置消息系统"
 
-#: src/bin/e_main.c:846
+#: src/bin/e_main.c:834
 msgid "Enlightenment cannot set up its msg system.\n"
 msgstr "Enlightenment 无法建立它的消息系统。\n"
 
-#: src/bin/e_main.c:853
+#: src/bin/e_main.c:841
 msgid "Setup Grab Input Handling"
 msgstr "设置捕捉输入处理"
 
-#: src/bin/e_main.c:857
+#: src/bin/e_main.c:845
 #, fuzzy
 msgid "Enlightenment cannot set up its grab input handling system.\n"
 msgstr "Enlightenment 无法设定它的绑定系统。\n"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:852
 msgid "Setup Modules"
 msgstr "设置模块"
 
-#: src/bin/e_main.c:868 src/bin/e_main.c:1060
+#: src/bin/e_main.c:856 src/bin/e_main.c:1041
 msgid "Enlightenment cannot set up its module system.\n"
 msgstr "Enlightenment 无法设置它的模块系统。\n"
 
-#: src/bin/e_main.c:875
+#: src/bin/e_main.c:863
 msgid "Setup Remembers"
 msgstr "设定记忆"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:867
 msgid "Enlightenment cannot setup remember settings.\n"
 msgstr "Enlightenment 无法设定它的记忆设置。\n"
 
-#: src/bin/e_main.c:886
+#: src/bin/e_main.c:874
 msgid "Setup Color Classes"
 msgstr "设定色彩类别"
 
-#: src/bin/e_main.c:890
+#: src/bin/e_main.c:878
 msgid "Enlightenment cannot set up its color class system.\n"
 msgstr "Enlightenment 无法建立它的颜色系统。\n"
 
-#: src/bin/e_main.c:897
+#: src/bin/e_main.c:885
 msgid "Setup Gadcon"
 msgstr "设定 Gadcon"
 
-#: src/bin/e_main.c:901
+#: src/bin/e_main.c:889
 msgid "Enlightenment cannot set up its gadget control system.\n"
 msgstr "Enlightenment 无法建立它的组件控制系统。\n"
 
-#: src/bin/e_main.c:908
+#: src/bin/e_main.c:896
 #, fuzzy
 msgid "Setup Toolbars"
 msgstr "设置工具条内容"
 
-#: src/bin/e_main.c:912
+#: src/bin/e_main.c:900
 #, fuzzy
 msgid "Enlightenment cannot set up its toolbars.\n"
 msgstr "Enlightenment 无法建立它的国际化系统。\n"
 
-#: src/bin/e_main.c:919
+#: src/bin/e_main.c:907
 msgid "Setup Wallpaper"
 msgstr "设置壁纸"
 
-#: src/bin/e_main.c:923
+#: src/bin/e_main.c:911
 msgid "Enlightenment cannot set up its desktop background system.\n"
 msgstr "Enlightenment 无法设置它的桌面背景系统。\n"
 
-#: src/bin/e_main.c:930
+#: src/bin/e_main.c:918
 msgid "Setup Mouse"
 msgstr "设置鼠标"
 
-#: src/bin/e_main.c:934
+#: src/bin/e_main.c:922
 msgid "Enlightenment cannot configure the mouse settings.\n"
 msgstr "Enlightenment 无法设定鼠标配置。\n"
 
-#: src/bin/e_main.c:941
-msgid "Enlightenment cannot setup XKB Keyboard layouts.\n"
-msgstr "Enlightenment 无法设定 XKB 键盘布局。\n"
-
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:928
 msgid "Setup Bindings"
 msgstr "设置绑定"
 
-#: src/bin/e_main.c:951
+#: src/bin/e_main.c:932
 msgid "Enlightenment cannot set up its bindings system.\n"
 msgstr "Enlightenment 无法设定它的绑定系统。\n"
 
-#: src/bin/e_main.c:958
+#: src/bin/e_main.c:939
 msgid "Setup Thumbnailer"
 msgstr "设置缩略图"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:943
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment 无法设定它的缩略图系统。\n"
 
-#: src/bin/e_main.c:971
+#: src/bin/e_main.c:952
 msgid "Enlightenment cannot initialize the Icon Cache system.\n"
 msgstr "Enlightenment 无法初始化图标缓存系统。\n"
 
-#: src/bin/e_main.c:980
+#: src/bin/e_main.c:961
 msgid "Enlightenment cannot initialize the XSettings system.\n"
 msgstr "Enlightenment 无法初始化 XSettings 系统。\n"
 
-#: src/bin/e_main.c:989
+#: src/bin/e_main.c:970
 msgid "Enlightenment cannot initialize the Update system.\n"
 msgstr "Enlightenment 无法初始化更新系统。\n"
 
-#: src/bin/e_main.c:996
+#: src/bin/e_main.c:977
 msgid "Setup Desktop Environment"
 msgstr "设置桌面环境"
 
-#: src/bin/e_main.c:1000
+#: src/bin/e_main.c:981
 msgid "Enlightenment cannot initialize its desktop environment.\n"
 msgstr "Enlightenment 无法初始化桌面环境。\n"
 
-#: src/bin/e_main.c:1007
+#: src/bin/e_main.c:988
 msgid "Setup File Ordering"
 msgstr "设置文件排列"
 
-#: src/bin/e_main.c:1011
+#: src/bin/e_main.c:992
 #, fuzzy
 msgid "Enlightenment cannot set up its order file system.\n"
 msgstr "Enlightenment 无法设定它的文件组织系统。"
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1007
 msgid "Load Modules"
 msgstr "载入模块"
 
-#: src/bin/e_main.c:1056
+#: src/bin/e_main.c:1037
 msgid "Setup Shelves"
 msgstr "设置书架"
 
-#: src/bin/e_main.c:1077
+#: src/bin/e_main.c:1058
 msgid "Almost Done"
 msgstr "接近完成"
 
-#: src/bin/e_main.c:1238
+#: src/bin/e_main.c:1219
 #, c-format
 msgid ""
 "Options:\n"
@@ -3380,7 +5388,7 @@ msgstr ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\t如果您需要此帮助，您不要这个选项。\n"
 
-#: src/bin/e_main.c:1291
+#: src/bin/e_main.c:1272
 msgid ""
 "You are executing enlightenment directly. This is\n"
 "bad. Please do not execute the \"enlightenment\"\n"
@@ -3390,11 +5398,11 @@ msgid ""
 "before enlightenment itself begins running.\n"
 msgstr ""
 
-#: src/bin/e_main.c:1572
+#: src/bin/e_main.c:1553
 msgid "Testing Format Support"
 msgstr "测试格式支持"
 
-#: src/bin/e_main.c:1576
+#: src/bin/e_main.c:1557
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -3402,7 +5410,7 @@ msgstr ""
 "Enlightenment 发现 Evas 不能创建画笔缓冲。\n"
 "请检查 Evas 是否支持软件缓冲。\n"
 
-#: src/bin/e_main.c:1588
+#: src/bin/e_main.c:1569
 msgid ""
 "Enlightenment found Evas can't load SVG files. Check Evas has SVG loader "
 "support.\n"
@@ -3410,7 +5418,7 @@ msgstr ""
 "Enlightenment 发现 Evas 不能加载 SVG 文件。请检查 Evas 是否有 SVG 加载支"
 "持。\n"
 
-#: src/bin/e_main.c:1598
+#: src/bin/e_main.c:1579
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader "
 "support.\n"
@@ -3418,7 +5426,7 @@ msgstr ""
 "Enlightenment 发现 Evas 不能加载 JPEG 文件。请检查 Evas 是否有 JPEG 加载支"
 "持。\n"
 
-#: src/bin/e_main.c:1608
+#: src/bin/e_main.c:1589
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG loader "
 "support.\n"
@@ -3426,7 +5434,7 @@ msgstr ""
 "Enlightenment 发现 Evas 不能加载 PNG 文件。请检查 Evas 是否有 PNG 加载支"
 "持。\n"
 
-#: src/bin/e_main.c:1618
+#: src/bin/e_main.c:1599
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET loader "
 "support.\n"
@@ -3434,7 +5442,7 @@ msgstr ""
 "Enlightenment 发现 Evas 不能加载 EET 文件。请检查 Evas 是否有 EET 加载支"
 "持。\n"
 
-#: src/bin/e_main.c:1632
+#: src/bin/e_main.c:1613
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -3443,7 +5451,24 @@ msgstr ""
 "Enlightenment 发现 Evas 不能加载 Sans 字体。\n"
 "请检查 Evas 是否支持 fontconfig，而且系统定义了 Sans 字体。\n"
 
-#: src/bin/e_main.c:1855
+#: src/bin/e_main.c:1669
+#, fuzzy
+msgid "Enlightenment cannot setup compositing.\n"
+msgstr "Enlightenment 无法设定它的记忆设置。\n"
+
+#: src/bin/e_main.c:1685
+msgid "Enlightenment cannot setup XKB Keyboard layouts.\n"
+msgstr "Enlightenment 无法设定 XKB 键盘布局。\n"
+
+#: src/bin/e_main.c:1691
+msgid "Setup DND"
+msgstr "设置 DND"
+
+#: src/bin/e_main.c:1695
+msgid "Enlightenment cannot set up its dnd system.\n"
+msgstr "Enlightenment 无法建立它的 DND 系统。\n"
+
+#: src/bin/e_main.c:1859
 #, fuzzy, c-format
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. There was an "
@@ -3453,11 +5478,11 @@ msgstr ""
 "Enlightenment 在启动前崩溃<br>，已经重新启动。此前加载的模块是：%s。<br>该模"
 "块已被禁用<br>将不会被加载。"
 
-#: src/bin/e_main.c:1860 src/bin/e_main.c:1876
+#: src/bin/e_main.c:1864 src/bin/e_main.c:1880
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment 在启动前崩溃，现已重新启动。"
 
-#: src/bin/e_main.c:1861
+#: src/bin/e_main.c:1865
 #, fuzzy, c-format
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>There was an "
@@ -3467,7 +5492,7 @@ msgstr ""
 "Enlightenment 在启动前崩溃，现已重新启动。<br>此前加载的模块是：%s。<br><br>"
 "该模块已被禁用，将不会被加载。"
 
-#: src/bin/e_main.c:1869
+#: src/bin/e_main.c:1873
 #, fuzzy
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
@@ -3478,7 +5503,7 @@ msgstr ""
 "Enlightenment 在启动前崩溃，现已重新启动。<br>所有模块都被禁用，以便排除您配"
 "置中出错的模块。<br>模块配置对话框将会引导您重新选择模块。"
 
-#: src/bin/e_main.c:1877
+#: src/bin/e_main.c:1881
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -3547,9 +5572,9 @@ msgstr "Enlightenment %s 模块"
 msgid "What action should be taken with this module?<br>"
 msgstr ""
 
-#: src/bin/e_module.c:729 src/bin/e_shelf.c:1661
+#: src/bin/e_module.c:729 src/bin/e_shelf.c:1659
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_shelves/e_int_config_shelf.c:392
+#: src/modules/conf_shelves/e_int_config_shelf.c:394
 #: src/modules/ibar/e_mod_config.c:199
 msgid "Keep"
 msgstr "保持"
@@ -3645,74 +5670,74 @@ msgstr ""
 msgid "Right-bottom Corner"
 msgstr ""
 
-#: src/bin/e_shelf.c:255 src/bin/e_shelf.c:998
+#: src/bin/e_shelf.c:256 src/bin/e_shelf.c:996
 #, fuzzy, c-format
 msgid "Shelf #%d"
 msgstr "书架 #"
 
-#: src/bin/e_shelf.c:842
+#: src/bin/e_shelf.c:840
 msgid "Shelf Autohide Error"
 msgstr "自动隐藏书架出错"
 
-#: src/bin/e_shelf.c:842
+#: src/bin/e_shelf.c:840
 msgid ""
 "Shelf autohiding will not work properly<br>with the current configuration; "
 "set your shelf to<br>\"Below Everything\" or disable autohiding."
 msgstr ""
 
-#: src/bin/e_shelf.c:999
+#: src/bin/e_shelf.c:997
 msgid "Add New Shelf"
 msgstr "添加新书架"
 
-#: src/bin/e_shelf.c:1020
+#: src/bin/e_shelf.c:1018
 msgid "Shelf Error"
 msgstr "书架出错"
 
-#: src/bin/e_shelf.c:1020
+#: src/bin/e_shelf.c:1018
 msgid "A shelf with that name already exists!"
 msgstr "该名字的书架已存在！"
 
-#: src/bin/e_shelf.c:1526 src/bin/e_shelf.c:2330
+#: src/bin/e_shelf.c:1524 src/bin/e_shelf.c:2328
 msgid "Stop Moving Gadgets"
 msgstr "停止移动组件"
 
-#: src/bin/e_shelf.c:1528 src/bin/e_shelf.c:2332
+#: src/bin/e_shelf.c:1526 src/bin/e_shelf.c:2330
 msgid "Begin Moving Gadgets"
 msgstr "开始移动组件"
 
-#: src/bin/e_shelf.c:1656
+#: src/bin/e_shelf.c:1654
 msgid "Are you sure you want to delete this shelf?"
 msgstr "确定要删除此书架？"
 
-#: src/bin/e_shelf.c:1658
+#: src/bin/e_shelf.c:1656
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "您要求删除此书架。<br><br>您确定要删除吗？"
 
-#: src/bin/e_shelf.c:2187
+#: src/bin/e_shelf.c:2185
 msgid "A shelf with that name and id already exists!"
 msgstr "该名字和 ID 的书架已存在！"
 
-#: src/bin/e_shelf.c:2206
+#: src/bin/e_shelf.c:2204
 msgid "Rename Shelf"
 msgstr "重命名书架"
 
-#: src/bin/e_shelf.c:2280 src/modules/conf_shelves/e_int_config_shelf.c:143
+#: src/bin/e_shelf.c:2278 src/modules/conf_shelves/e_int_config_shelf.c:145
 #: src/modules/ibar/e_mod_main.c:394 src/modules/ibar/e_mod_main.c:870
 msgid "Contents"
 msgstr "内容"
 
 # 定义面板的方向位置，如左上，右下啥的。
-#: src/bin/e_shelf.c:2290
+#: src/bin/e_shelf.c:2288
 msgid "Orientation"
 msgstr "位置"
 
-#: src/bin/e_shelf.c:2299 src/modules/quickaccess/e_mod_quickaccess.c:792
+#: src/bin/e_shelf.c:2297 src/modules/quickaccess/e_mod_quickaccess.c:792
 msgid "Autohide"
 msgstr "自动隐藏"
 
-#: src/bin/e_shelf.c:2306
+#: src/bin/e_shelf.c:2304
 msgid "Refresh"
 msgstr "刷新"
 
@@ -3846,14 +5871,14 @@ msgstr "休眠"
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "正在休眠。<br><hilight>请稍侯。</hilight>"
 
+#: src/bin/e_theme.c:36
+msgid "Set As Theme"
+msgstr "设置为主题"
+
 #: src/bin/e_theme_about.c:25
 msgid "Select Theme"
 msgstr "选择主题"
 
-#: src/bin/e_theme.c:37
-msgid "Set As Theme"
-msgstr "设置为主题"
-
 #: src/bin/e_toolbar.c:343
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移动/缩放项目"
@@ -3966,11 +5991,11 @@ msgstr[1] "%li 分钟前"
 #: src/bin/e_utils.c:933 src/bin/e_widget_filepreview.c:597
 #: src/bin/e_widget_filepreview.c:598 src/bin/e_widget_filepreview.c:599
 #: src/bin/e_widget_filepreview.c:630 src/bin/e_widget_filepreview.c:641
-#: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_bindings/e_int_config_edgebindings.c:1227
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 #: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1227
 #: src/modules/conf_bindings/e_int_config_keybindings.c:970
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_dialogs/e_int_config_profiles.c:298
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "未知"
@@ -4211,6 +6236,11 @@ msgstr "到上一级目录"
 msgid "Access Settings"
 msgstr "访问设置"
 
+#: src/modules/appmenu/e_mod_main.c:88
+#, fuzzy
+msgid "Application Menu"
+msgstr "应用程序"
+
 #: src/modules/backlight/e_mod_main.c:366
 #: src/modules/conf_display/e_mod_main.c:36
 msgid "Backlight"
@@ -4299,10 +6329,11 @@ msgid "Auto Detect"
 msgstr "自动检测"
 
 #: src/modules/battery/e_mod_config.c:295
-#: src/modules/conf_comp/e_mod_main.c:236
 #: src/modules/conf_applications/e_mod_main.c:60
+#: src/modules/conf_comp/e_mod_main.c:236
 #: src/modules/conf_display/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:116
+#: src/modules/conf_wallpaper2/e_mod_main.c:24
 #: src/modules/temperature/e_mod_config.c:269
 msgid "Internal"
 msgstr "内部"
@@ -4355,6 +6386,174 @@ msgstr "错误"
 msgid "Battery Meter"
 msgstr "电池标尺"
 
+#: src/modules/bluez4/agent.c:116
+#, fuzzy
+msgid "Reject"
+msgstr "弹出"
+
+#: src/modules/bluez4/agent.c:133
+msgid "Pin Code Requested"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:134
+msgid ""
+"Enter the PinCode above. It should have 1-16 characters and can be "
+"alphanumeric."
+msgstr ""
+
+#: src/modules/bluez4/agent.c:145
+msgid "Passkey Requested"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:146
+msgid "Enter the Passkey above. It should be a numeric value between 0-999999."
+msgstr ""
+
+#: src/modules/bluez4/agent.c:163
+#, c-format
+msgid "%d keys were typed on %s. Passkey is %06d"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:165
+#, fuzzy
+msgid "Display Passkey"
+msgstr "显示类别"
+
+#: src/modules/bluez4/agent.c:178
+#, c-format
+msgid "Pincode for %s is %s"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:179
+#, fuzzy
+msgid "Display Pincode"
+msgstr "显示标题"
+
+#: src/modules/bluez4/agent.c:193
+#, c-format
+msgid "%06d is the passkey presented in %s?"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:196
+#, fuzzy
+msgid "Confirm Request"
+msgstr "确认删除"
+
+#: src/modules/bluez4/agent.c:196 src/modules/shot/e_mod_main.c:567
+msgid "Confirm"
+msgstr "确定"
+
+#: src/modules/bluez4/agent.c:209
+#, c-format
+msgid "Grant permission for %s to connect?"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:212
+msgid "Authorize Connection"
+msgstr ""
+
+#: src/modules/bluez4/agent.c:212
+msgid "Grant"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:91 src/modules/bluez4/ebluez4.c:221
+#: src/modules/bluez4/ebluez4.c:440 src/modules/bluez4/ebluez4.c:462
+#: src/modules/bluez4/ebluez4.c:603 src/modules/bluez4/ebluez4.c:621
+#: src/modules/bluez4/ebluez4.c:681 src/modules/bluez4/ebluez4.c:697
+#, fuzzy
+msgid "Bluez Error"
+msgstr "运行时错误"
+
+#: src/modules/bluez4/e_mod_main.c:119
+msgid "Searching for Devices..."
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:190 src/modules/bluez4/e_mod_main.c:461
+#, fuzzy
+msgid "Adapter Settings"
+msgstr "其它设置"
+
+#: src/modules/bluez4/e_mod_main.c:202
+#, fuzzy
+msgid "Powered"
+msgstr "降低"
+
+#: src/modules/bluez4/e_mod_main.c:217
+#, fuzzy
+msgid "Pairable"
+msgstr "可用"
+
+#: src/modules/bluez4/e_mod_main.c:264
+#, fuzzy
+msgid "Adapters Available"
+msgstr "可用"
+
+#: src/modules/bluez4/e_mod_main.c:374
+#, fuzzy
+msgid "Paired Devices"
+msgstr "可移动设备"
+
+#: src/modules/bluez4/e_mod_main.c:398
+msgid "Disconnect"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:404
+msgid "Connect"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:408
+msgid "Forget"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:417
+#, fuzzy
+msgid "Lock on disconnect"
+msgstr "锁定图标移动"
+
+#: src/modules/bluez4/e_mod_main.c:425
+msgid "Unlock on disconnect"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:447 src/modules/bluez4/e_mod_main.c:562
+msgid "Bluez4"
+msgstr ""
+
+#: src/modules/bluez4/e_mod_main.c:457
+#, fuzzy
+msgid "Search New Devices"
+msgstr "搜索目录"
+
+#: src/modules/bluez4/e_mod_main.c:808
+msgid "An error has ocurred"
+msgstr ""
+
+#: src/modules/bluez4/ebluez4.c:218 src/modules/bluez4/ebluez4.c:460
+#, c-format
+msgid "Property of %s changed, but could not be read"
+msgstr ""
+
+#: src/modules/bluez4/ebluez4.c:435
+#, fuzzy
+msgid "Error reading list of devices"
+msgstr "载入模块时出错"
+
+#: src/modules/bluez4/ebluez4.c:598
+#, fuzzy
+msgid "Error reading list of adapters"
+msgstr "无法创建目录"
+
+#: src/modules/bluez4/ebluez4.c:616
+msgid "Error reading path of Default Adapter"
+msgstr ""
+
+#: src/modules/bluez4/ebluez4.c:676
+msgid "Error reading path of Removed Adapter"
+msgstr ""
+
+#: src/modules/bluez4/ebluez4.c:692
+msgid "Error reading path of Added Adapter"
+msgstr ""
+
 #: src/modules/clock/e_mod_config.c:36
 msgid "Clock Settings"
 msgstr "时钟设置"
@@ -4430,299 +6629,60 @@ msgstr ""
 msgid "Toggle calendar"
 msgstr "切换日历"
 
-#: src/modules/conf_comp/e_mod_config.c:88
-msgid "Composite Settings"
-msgstr "混成设置"
-
-#: src/modules/conf_comp/e_mod_config.c:188
-#, fuzzy
-msgid "Edit window matches"
-msgstr "最大宽度"
-
-#: src/modules/conf_comp/e_mod_config.c:191
-#: src/modules/conf_comp/e_mod_config.c:567
-msgid "Select default style"
-msgstr "选择默认样式"
+#: src/modules/conf/e_mod_config.c:35 src/modules/conf/e_mod_main.c:290
+#: src/modules/conf/e_mod_main.c:304
+msgid "Configuration Panel"
+msgstr "配置面板"
 
-#: src/modules/conf_comp/e_mod_config.c:197
-msgid "Styles"
-msgstr "样式"
+#: src/modules/conf/e_mod_config.c:65
+msgid "Show configurations in menu"
+msgstr "在菜单里显示配置"
 
-#: src/modules/conf_comp/e_mod_config.c:202
-msgid "Smooth scaling"
-msgstr "平滑缩放"
-
-#: src/modules/conf_comp/e_mod_config.c:207
-#, fuzzy
-msgid "Fast Effects"
-msgstr "效果"
-
-#: src/modules/conf_comp/e_mod_config.c:208
-#, fuzzy
-msgid "Enable fast composite effects for windows"
-msgstr "不混合全屏窗口"
-
-#: src/modules/conf_comp/e_mod_config.c:211
-msgid "Enable fast composite effects for menus"
+#: src/modules/conf/e_mod_main.c:269
+msgid "conf module cannot be loaded when conf2 module is already loaded!"
 msgstr ""
 
-#: src/modules/conf_comp/e_mod_config.c:214
-msgid "Enable fast composite effects for popups"
-msgstr ""
+#: src/modules/conf/e_mod_main.c:277 src/modules/conf/e_mod_main.c:281
+#: src/modules/conf/e_mod_main.c:457
+msgid "Settings Panel"
+msgstr "设置面板"
 
-#: src/modules/conf_comp/e_mod_config.c:217
-#, fuzzy
-msgid "Enable fast composite effects for objects"
-msgstr "不混合全屏窗口"
+#: src/modules/conf/e_mod_main.c:426
+#: src/modules/conf_display/e_int_config_screensaver.c:195
+msgid "Presentation"
+msgstr "演示"
 
-#: src/modules/conf_comp/e_mod_config.c:220
-msgid "Enable fast composite effects for overrides"
-msgstr ""
+#: src/modules/conf/e_mod_main.c:433
+msgid "Offline"
+msgstr "脱机"
 
-#: src/modules/conf_comp/e_mod_config.c:225
-#, fuzzy
-msgid "Disable Effects"
-msgstr "空闲效果"
+#: src/modules/conf/e_mod_main.c:462
+msgid "Modes"
+msgstr "模式"
 
-#: src/modules/conf_comp/e_mod_config.c:226
+#: src/modules/conf2/e_conf2.c:1152 src/modules/conf2/e_mod_main.c:310
+#: src/modules/conf2/e_mod_main.c:368
 #, fuzzy
-msgid "Disable composite effects for windows"
-msgstr "不混合全屏窗口"
+msgid "Control Panel"
+msgstr "配置面板"
 
-#: src/modules/conf_comp/e_mod_config.c:229
-msgid "Disable composite effects for menus"
+#: src/modules/conf2/e_conf2.c:1191
+msgid "Search: "
 msgstr ""
 
-#: src/modules/conf_comp/e_mod_config.c:232
-msgid "Disable composite effects for popups"
+#: src/modules/conf2/e_conf2.c:1269
+msgid "Discard"
 msgstr ""
 
-#: src/modules/conf_comp/e_mod_config.c:235
+#: src/modules/conf2/e_mod_main.c:287 src/modules/conf2/e_mod_main.c:314
 #, fuzzy
-msgid "Disable composite effects for objects"
-msgstr "不混合全屏窗口"
-
-#: src/modules/conf_comp/e_mod_config.c:238
-msgid "Disable composite effects for overrides"
-msgstr ""
-
-#: src/modules/conf_comp/e_mod_config.c:241
-msgid "Disable composite effects for screen"
-msgstr ""
-
-#: src/modules/conf_comp/e_mod_config.c:246
-msgid "Effects"
-msgstr "效果"
-
-#: src/modules/conf_comp/e_mod_config.c:250
-msgid "Sync windows"
-msgstr "同步窗口"
-
-#: src/modules/conf_comp/e_mod_config.c:252
-msgid "Loose sync"
-msgstr "宽松同步"
-
-#: src/modules/conf_comp/e_mod_config.c:254
-msgid "Grab Server during draw"
-msgstr ""
-
-#: src/modules/conf_comp/e_mod_config.c:256
-msgid "Initial draw timeout for newly mapped windows"
-msgstr ""
-
-#: src/modules/conf_comp/e_mod_config.c:258
-#, c-format
-msgid "%1.2f Seconds"
-msgstr "%1.2f 秒"
-
-#: src/modules/conf_comp/e_mod_config.c:260
-msgid "Sync"
-msgstr "同步"
-
-#: src/modules/conf_comp/e_mod_config.c:265
-#: src/modules/conf_comp/e_mod_config.c:580
-msgid "Software"
-msgstr "软件"
-
-#: src/modules/conf_comp/e_mod_config.c:271
-#: src/modules/conf_comp/e_mod_config.c:586
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/modules/conf_comp/e_mod_config.c:274
-msgid "OpenGL options"
-msgstr "OpenGL 选项"
-
-#: src/modules/conf_comp/e_mod_config.c:276
-#: src/modules/conf_comp/e_mod_config.c:543
-msgid "Tear-free updates (VSynced)"
-msgstr "Tear-free 更新(VSynced)"
-
-#: src/modules/conf_comp/e_mod_config.c:278
-msgid "Texture from pixmap"
-msgstr "使用位图纹理"
-
-#: src/modules/conf_comp/e_mod_config.c:285
-msgid "Assume swapping method:"
-msgstr "默认交换方法："
-
-#: src/modules/conf_comp/e_mod_config.c:288
-msgid "Auto"
-msgstr "自动"
-
-#: src/modules/conf_comp/e_mod_config.c:290
-msgid "Invalidate (full redraw)"
-msgstr "设置无效(完全重绘)"
-
-#: src/modules/conf_comp/e_mod_config.c:292
-msgid "Copy from back to front"
-msgstr "从后方复制到前方"
-
-#: src/modules/conf_comp/e_mod_config.c:294
-msgid "Double buffered swaps"
-msgstr "双重缓冲"
-
-#: src/modules/conf_comp/e_mod_config.c:296
-msgid "Triple buffered swaps"
-msgstr "三重缓冲"
-
-#: src/modules/conf_comp/e_mod_config.c:306
-#: src/modules/conf_performance/e_mod_main.c:19
-msgid "Engine"
-msgstr "引擎"
-
-#: src/modules/conf_comp/e_mod_config.c:310
-msgid "Send flush"
-msgstr "发送刷新"
-
-#: src/modules/conf_comp/e_mod_config.c:312
-msgid "Send dump"
-msgstr "发送转储"
-
-#: src/modules/conf_comp/e_mod_config.c:314
-#: src/modules/conf_comp/e_mod_config.c:549
-msgid "Don't composite fullscreen windows"
-msgstr "不混合全屏窗口"
-
-#: src/modules/conf_comp/e_mod_config.c:342
-msgid "Memory"
-msgstr "内存"
-
-#: src/modules/conf_comp/e_mod_config.c:390
-msgid "Show Framerate"
-msgstr "显示帧率"
-
-#: src/modules/conf_comp/e_mod_config.c:392
-msgid "Rolling average frame count"
-msgstr ""
-
-#: src/modules/conf_comp/e_mod_config.c:394
-#, c-format
-msgid "%1.0f Frames"
-msgstr "%1.0f 帧"
-
-#: src/modules/conf_comp/e_mod_config.c:398
-msgid "Corner"
-msgstr "角"
-
-#: src/modules/conf_comp/e_mod_config.c:401
-msgid "Top Left"
-msgstr "左上"
-
-#: src/modules/conf_comp/e_mod_config.c:404
-msgid "Top Right"
-msgstr "右上"
-
-#: src/modules/conf_comp/e_mod_config.c:407
-msgid "Bottom Left"
-msgstr "左下"
-
-#: src/modules/conf_comp/e_mod_config.c:410
-msgid "Bottom Right"
-msgstr "右下"
-
-#: src/modules/conf_comp/e_mod_config.c:415
-msgid "Debug"
-msgstr "调试"
-
-#: src/modules/conf_comp/e_mod_config.c:546
-msgid "Smooth scaling of window content"
-msgstr "窗口内容平滑缩放"
-
-#: src/modules/conf_comp/e_mod_config.c:554
-msgid "Enable \"fast\" composite effects"
-msgstr ""
+msgid "Configuration"
+msgstr "配置"
 
-#: src/modules/conf_comp/e_mod_config.c:563 src/modules/wizard/page_150.c:91
-msgid "Disable composite effects"
+#: src/modules/conf2/e_mod_main.c:300
+msgid "conf2 module cannot be loaded when conf module is already loaded!"
 msgstr ""
 
-#: src/modules/conf_comp/e_mod_config.c:590
-msgid "To reset compositor:"
-msgstr "重置合成器："
-
-#: src/modules/conf_comp/e_mod_config.c:592
-msgid "Ctrl+Alt+Shift+Home"
-msgstr "Ctrl+Alt+Shift+Home"
-
-#: src/modules/conf_comp/e_mod_config.c:595
-msgid "Rendering"
-msgstr "渲染"
-
-#: src/modules/conf_comp/e_mod_main.c:28
-#: src/modules/conf_comp/e_mod_main.c:233
-#: src/modules/conf_comp/e_mod_main.c:242
-msgid "Composite"
-msgstr "混成"
-
-#: src/modules/conf_comp/e_mod_main.c:55
-msgid "Visible"
-msgstr "可见"
-
-#: src/modules/conf_comp/e_mod_main.c:60
-msgid "Focus-Out"
-msgstr "失焦"
-
-#: src/modules/conf_comp/e_mod_main.c:65
-msgid "Focus-In"
-msgstr "聚焦"
-
-#: src/modules/conf_comp/e_mod_main.c:238
-#, fuzzy
-msgid "Composite Style Settings"
-msgstr "混成设置"
-
-#: src/modules/conf_comp/e_mod_main.c:259
-#, fuzzy
-msgid "comp_settings"
-msgstr "混成设置"
-
-#: src/modules/conf_comp/e_mod_main.c:259
-#, fuzzy
-msgid "Advanced composite settings panel"
-msgstr "混成设置"
-
-#: src/modules/conf_comp/e_mod_main.c:259
-#, fuzzy
-msgid "composite"
-msgstr "混成"
-
-#: src/modules/conf_comp/e_mod_main.c:259
-#: src/modules/conf_window_remembers/e_mod_main.c:28
-#: src/modules/fileman/e_mod_main.c:399
-#: src/modules/quickaccess/e_mod_main.c:68
-#: src/modules/quickaccess/e_mod_main.c:71
-#: src/modules/quickaccess/e_mod_main.c:74
-#: src/modules/quickaccess/e_mod_main.c:76
-#: src/modules/quickaccess/e_mod_main.c:78
-#: src/modules/tiling/e_mod_tiling.c:3910
-#: src/modules/tiling/e_mod_tiling.c:3915
-#: src/modules/tiling/e_mod_tiling.c:3917
-#: src/modules/tiling/e_mod_tiling.c:4051
-#, fuzzy
-msgid "border"
-msgstr "边框"
-
 #: src/modules/conf_applications/e_int_config_apps.c:83
 #: src/modules/conf_applications/e_int_config_apps.c:97
 #: src/modules/conf_applications/e_mod_main.c:33
@@ -4851,33 +6811,6 @@ msgstr ""
 msgid "Create a new application launcher"
 msgstr "创建应用程序启动器"
 
-#: src/modules/conf_applications/e_mod_main.c:71
-#: src/modules/conf_applications/e_mod_main.c:74
-#: src/modules/conf_applications/e_mod_main.c:77
-#: src/modules/conf_applications/e_mod_main.c:80
-#: src/modules/conf_applications/e_mod_main.c:83
-#: src/modules/conf_applications/e_mod_main.c:86
-#: src/modules/conf_applications/e_mod_main.c:89
-#: src/modules/conf_applications/e_mod_main.c:92
-#: src/modules/conf_applications/e_mod_main.c:95
-#, fuzzy
-msgid "application"
-msgstr "应用程序"
-
-#: src/modules/conf_applications/e_mod_main.c:71
-#: src/modules/conf_applications/e_mod_main.c:74
-#: src/modules/conf_applications/e_mod_main.c:77
-#: src/modules/conf_applications/e_mod_main.c:80
-#: src/modules/conf_applications/e_mod_main.c:83
-#: src/modules/conf_applications/e_mod_main.c:86
-#: src/modules/conf_applications/e_mod_main.c:89
-#: src/modules/conf_applications/e_mod_main.c:92
-#: src/modules/conf_applications/e_mod_main.c:95
-#: src/modules/everything/e_mod_main.c:70
-#, fuzzy
-msgid "exec"
-msgstr "执行"
-
 #: src/modules/conf_applications/e_mod_main.c:74
 msgid "apps"
 msgstr ""
@@ -4916,13 +6849,6 @@ msgstr "桌面锁定密码"
 msgid "Desk lock applications"
 msgstr "无应用程序"
 
-#: src/modules/conf_applications/e_mod_main.c:83
-#: src/modules/conf_applications/e_mod_main.c:86
-#: src/modules/conf_intl/e_mod_main.c:41
-#, fuzzy
-msgid "desklock"
-msgstr "设置桌面锁定"
-
 #: src/modules/conf_applications/e_mod_main.c:86
 #, fuzzy
 msgid "deskunlock apps"
@@ -4953,11 +6879,6 @@ msgstr "启动"
 msgid "Enlightenment start applications"
 msgstr "允许应用程序使用图标主题"
 
-#: src/modules/conf_applications/e_mod_main.c:92
-#, fuzzy
-msgid "startup"
-msgstr "启动"
-
 #: src/modules/conf_applications/e_mod_main.c:95
 #, fuzzy
 msgid "default apps"
@@ -4968,425 +6889,137 @@ msgstr "默认"
 msgid "Enlightenment default applications"
 msgstr "Enlightenment 默认"
 
-#: src/modules/conf_dialogs/e_int_config_profiles.c:53
-msgid "Profile Selector"
-msgstr "用户环境选择器"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:106
-msgid "Available Profiles"
-msgstr "可用用户环境"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:122
-#: src/modules/wizard/page_020.c:115
-msgid "Select a profile"
-msgstr "选择一个配置文件"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:138
-msgid "Scratch"
-msgstr ""
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:141
-msgid "Reset"
-msgstr "重置"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:292
-#, c-format
-msgid "Selected profile: %s"
-msgstr "选择一个配置文件：%s"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:315
-msgid "Add New Profile"
-msgstr "添加新用户环境"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:336
-#, c-format
-msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "即将删除“%s”配置文件。<br><br>您确定要删除吗？"
-
-#: src/modules/conf_dialogs/e_int_config_profiles.c:338
-msgid "Are you sure you want to delete this profile?"
-msgstr "您确定要删除这个用户环境？"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:38
-msgid "Dialog Settings"
-msgstr "对话框设置"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:109
-#: src/modules/conf_performance/e_int_config_engine.c:86
-#: src/modules/conf_theme/e_int_config_fonts.c:674
-#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:97
-#: src/modules/mixer/conf_gadget.c:192 src/modules/mixer/conf_module.c:91
-msgid "General Settings"
-msgstr "常规设置"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:111
-msgid "Disable Confirmation Dialogs"
-msgstr "禁用确认对话框"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:113
-msgid "Normal Windows"
-msgstr "正常窗口"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:120
-msgid "Default Settings Dialogs Mode"
-msgstr "对话框模式默认模式"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:122
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:166
-msgid "Basic Mode"
-msgstr "基本模式"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:124
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:168
-msgid "Advanced Mode"
-msgstr "高级模式"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:129
-msgid "Remember size and position of dialogs"
-msgstr "记住对话框的位置和尺寸"
-
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:163
-msgid "Default Dialog Mode"
-msgstr "默认对话框模式"
-
-#: src/modules/conf_dialogs/e_mod_main.c:18
-msgid "Dialogs"
-msgstr "对话框"
-
-#: src/modules/conf_dialogs/e_mod_main.c:19
-msgid "Profiles"
-msgstr "用户环境"
-
-#: src/modules/conf_dialogs/e_mod_main.c:28
-#, fuzzy
-msgid "profiles"
-msgstr "用户环境"
-
-#: src/modules/conf_dialogs/e_mod_main.c:28
-#, fuzzy
-msgid "Enlightenment profile settings"
-msgstr "Enlightenment 无法设定它的记忆设置。\n"
-
-#: src/modules/conf_dialogs/e_mod_main.c:28
-#, fuzzy
-msgid "profile"
-msgstr "配置文件"
-
-#: src/modules/conf_display/e_int_config_desks.c:52
-#: src/modules/pager/e_mod_main.c:886
-msgid "Virtual Desktops Settings"
-msgstr "虚拟桌面设置"
-
-#: src/modules/conf_display/e_int_config_desks.c:168
-msgid "Number of Desktops"
-msgstr "桌面数目"
-
-#: src/modules/conf_display/e_int_config_desks.c:171
-msgid "Click to change wallpaper"
-msgstr "点击更改壁纸"
-
-#: src/modules/conf_display/e_int_config_desks.c:178
-#: src/modules/conf_display/e_int_config_desks.c:183
-#: src/modules/conf_display/e_int_config_desklock.c:275
-#: src/modules/conf_interaction/e_int_config_mouse.c:207
-#: src/modules/conf_interaction/e_int_config_mouse.c:213
-#: src/modules/everything/evry_config.c:405
-#: src/modules/everything/evry_config.c:547
-#: src/modules/everything/evry_config.c:554
-#: src/modules/everything/evry_config.c:580
-#: src/modules/everything/evry_config.c:587
-#: src/modules/fileman/e_mod_config.c:326
-#: src/modules/syscon/e_int_config_syscon.c:148
-#: src/modules/syscon/e_int_config_syscon.c:153
-#: src/modules/syscon/e_int_config_syscon.c:158
-#: src/modules/tiling/e_mod_config.c:129
-#, c-format
-msgid "%1.0f"
-msgstr "%1.0f"
-
-#: src/modules/conf_display/e_int_config_desks.c:190
-msgid "Desktop Flip"
-msgstr "桌面翻转"
-
-#: src/modules/conf_display/e_int_config_desks.c:191
-msgid "Flip when dragging objects to the screen edge"
-msgstr "拖拽对象到屏幕边缘时翻转"
-
-#: src/modules/conf_display/e_int_config_desks.c:194
-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:192
-msgid "Desktop Window Profile"
-msgstr "桌面窗口配置"
-
-#: src/modules/conf_display/e_int_config_desks.c:202
-msgid "Use desktop window profile"
-msgstr "使用桌面窗口配置"
-
-#: src/modules/conf_display/e_int_config_desks.c:208
-msgid "Desktops"
-msgstr "桌面"
-
-#: src/modules/conf_display/e_int_config_desks.c:213
-#: src/modules/everything/evry_config.c:495
-msgid "Off"
-msgstr "关"
-
-#: src/modules/conf_display/e_int_config_desks.c:216
-msgid "Pane"
-msgstr "面板"
-
-#: src/modules/conf_display/e_int_config_desks.c:219
-msgid "Zoom"
-msgstr "缩放"
-
-#: src/modules/conf_display/e_int_config_desks.c:223
-msgid "Animation speed"
-msgstr "动画速度"
-
-#: src/modules/conf_display/e_int_config_desks.c:226
-#: src/modules/conf_performance/e_int_config_powermanagement.c:204
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:287
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:241
-#, c-format
-msgid "%1.1f s"
-msgstr "%1.1f s"
-
-#: src/modules/conf_display/e_int_config_desks.c:231
-msgid "Flip Animation"
-msgstr "翻转动画"
-
-#: src/modules/conf_display/e_int_config_desk.c:54
-msgid "Desk Settings"
-msgstr "桌面设置"
-
-#: src/modules/conf_display/e_int_config_desk.c:193
-#, fuzzy
-msgid "Profile name"
-msgstr "配置名称:"
-
-#: src/modules/conf_display/e_int_config_desk.c:200
-#: src/modules/conf_display/e_int_config_desklock.c:357
-#: src/modules/conf_theme/e_mod_main.c:29
-#: src/modules/conf_theme/e_mod_main.c:118
-#: src/modules/conf_theme/e_mod_main.c:125
-#: src/modules/conf_theme/e_mod_main.c:154
-msgid "Wallpaper"
-msgstr "壁纸"
-
-#: src/modules/conf_display/e_int_config_desk.c:206
-#: src/modules/fileman/e_int_config_mime.c:184
-msgid "Set"
-msgstr "设定"
-
-#: src/modules/conf_display/e_int_config_desklock_fsel.c:41
-msgid "Select a Background..."
-msgstr "选择背景..."
-
-#: src/modules/conf_display/e_int_config_desklock_fsel.c:84
-#: src/modules/conf_intl/e_int_config_imc.c:803
-#: src/modules/conf_theme/e_int_config_wallpaper.c:423
-#: src/modules/conf_theme/e_int_config_wallpaper.c:577
-#: src/modules/conf_theme/e_int_config_startup.c:268
-#: src/modules/conf_theme/e_int_config_theme.c:728
-#: src/modules/conf_theme/e_int_config_theme.c:1103
-#: src/modules/conf_theme/e_int_config_theme.c:1112
-#: src/modules/gadman/e_mod_config.c:248
-msgid "Personal"
-msgstr "个人"
-
-#: src/modules/conf_display/e_int_config_desklock.c:77
-msgid "Screen Lock Settings"
-msgstr "屏幕锁定设置"
-
-#: src/modules/conf_display/e_int_config_desklock.c:197
-msgid "Lock on Startup"
-msgstr "启动时锁定"
-
-#: src/modules/conf_display/e_int_config_desklock.c:200
-msgid "Lock on Suspend"
-msgstr "挂起时锁定"
-
-#: src/modules/conf_display/e_int_config_desklock.c:204
-msgid "Custom Screenlock Command"
-msgstr "自定义屏幕锁定命令"
-
-#: src/modules/conf_display/e_int_config_desklock.c:208
-msgid "Use Custom Screenlock Command"
-msgstr "使用自定义屏幕锁定命令"
-
-#: src/modules/conf_display/e_int_config_desklock.c:211
-msgid "Locking"
-msgstr "锁定"
-
-#: src/modules/conf_display/e_int_config_desklock.c:253
-msgid "Keyboard Layout"
-msgstr "键盘布局"
-
-#: src/modules/conf_display/e_int_config_desklock.c:259
-msgid "Show on all screens"
-msgstr "显示到所有屏幕"
-
-#: src/modules/conf_display/e_int_config_desklock.c:264
-msgid "Show on current screen"
-msgstr "显示在当前屏幕"
-
-#: src/modules/conf_display/e_int_config_desklock.c:269
-msgid "Show on screen #:"
-msgstr "显示在屏幕 #:"
-
-#: src/modules/conf_display/e_int_config_desklock.c:279
-msgid "Login Box"
-msgstr "登录框"
-
-#: src/modules/conf_display/e_int_config_desklock.c:284
-msgid "Lock after X screensaver activates"
-msgstr "当屏幕保护程序运行时锁定"
-
-#: src/modules/conf_display/e_int_config_desklock.c:289
-#: src/modules/conf_display/e_int_config_desklock.c:312
-#: src/modules/conf_display/e_int_config_screensaver.c:174
-#: src/modules/conf_display/e_int_config_screensaver.c:187
-#: src/modules/fileman/e_mod_config.c:415 src/modules/fileman/e_mod_main.c:445
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
-#: src/modules/conf_display/e_int_config_desklock.c:296
-msgid "Lock when idle time exceeded"
-msgstr "空闲指定时间后锁定"
-
-#: src/modules/conf_display/e_int_config_desklock.c:300
-#: src/modules/conf_display/e_int_config_screensaver.c:157
-#, c-format
-msgid "%1.0f minutes"
-msgstr "%1.0f 分"
-
-#: src/modules/conf_display/e_int_config_desklock.c:304
-msgid "Timers"
-msgstr "计时器"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
+msgid "ACPI Bindings"
+msgstr "ACPI 绑定"
 
-#: src/modules/conf_display/e_int_config_desklock.c:309
-#: src/modules/conf_display/e_int_config_screensaver.c:183
-msgid "Suggest if deactivated before"
-msgstr "在禁用前提示"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:286
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:789
+msgid "Action"
+msgstr "动作"
 
-#: src/modules/conf_display/e_int_config_desklock.c:316
-msgid "Presentation Mode"
-msgstr "演示模式"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:299
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:796
+msgid "Action Params"
+msgstr "动作参数"
 
-#: src/modules/conf_display/e_int_config_desklock.c:323
-#: src/modules/gadman/e_mod_config.c:210
-msgid "Theme Defined"
-msgstr "已定义主题"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
+msgid "AC Adapter Unplugged"
+msgstr "电源适配器拔出"
 
-#: src/modules/conf_display/e_int_config_desklock.c:327
-msgid "Theme Wallpaper"
-msgstr "主题壁纸"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
+msgid "AC Adapter Plugged"
+msgstr "电源适配器插入"
 
-#: src/modules/conf_display/e_int_config_desklock.c:331
-msgid "Current Wallpaper"
-msgstr "当前壁纸"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
+msgid "Ac Adapter"
+msgstr "电源适配器"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:54
-msgid "Screen Saver Settings"
-msgstr "屏幕保护程序设置"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
+msgid "Button"
+msgstr "按钮"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:150
-msgid "Enable screen blanking"
-msgstr "开启屏幕空白"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
+msgid "Fan"
+msgstr "风扇"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:154
-#: src/modules/syscon/e_int_config_syscon.c:167
-msgid "Timeout"
-msgstr "超时"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
+msgid "Lid Unknown"
+msgstr "盖子未知"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:162
-msgid "Suspend on blank"
-msgstr "当屏幕空白时挂起"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
+msgid "Lid Closed"
+msgstr "盖子关闭"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:166
-msgid "Suspend even if AC"
-msgstr "使用交流电源时仍然挂起"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
+msgid "Lid Opened"
+msgstr "盖子打开"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:171
-msgid "Suspend delay"
-msgstr "挂起延迟"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
+msgid "Lid"
+msgstr "盖子"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:179
-#: src/modules/conf_display/e_mod_main.c:32
-msgid "Blanking"
-msgstr "空白"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
+msgid "Power Button"
+msgstr "电源按钮"
 
-#: src/modules/conf_display/e_int_config_screensaver.c:195
-msgid "Presentation"
-msgstr "演示"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
+msgid "Processor"
+msgstr "处理器"
 
-#: src/modules/conf_display/e_int_config_dpms.c:57
-msgid "Backlight Settings"
-msgstr "背光设置"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
+msgid "Sleep Button"
+msgstr "休眠按钮"
 
-#: src/modules/conf_display/e_int_config_dpms.c:175
-msgid "Normal Backlight"
-msgstr "正常背光"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
+msgid "Thermal"
+msgstr "散热"
 
-#: src/modules/conf_display/e_int_config_dpms.c:177
-#: src/modules/conf_display/e_int_config_dpms.c:183
-#, c-format
-msgid "%3.0f"
-msgstr "%3.0f"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
+msgid "Video"
+msgstr "视频"
 
-#: src/modules/conf_display/e_int_config_dpms.c:181
-msgid "Dim Backlight"
-msgstr "降低背光"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
+msgid "Wifi"
+msgstr "Wifi"
 
-#: src/modules/conf_display/e_int_config_dpms.c:187
-msgid "Idle Fade Time"
-msgstr "空闲淡出时间"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
+msgid "Zoom Out"
+msgstr "缩小"
 
-#: src/modules/conf_display/e_int_config_dpms.c:190
-#, c-format
-msgid "%1.0f second(s)"
-msgstr "%1.0f 秒"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
+msgid "Zoom In"
+msgstr "放大"
 
-#: src/modules/conf_display/e_int_config_dpms.c:196
-msgid "Fade Time"
-msgstr "渐变时间"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
+msgid "Brightness Down"
+msgstr "亮度降低"
 
-#: src/modules/conf_display/e_int_config_dpms.c:198
-#, c-format
-msgid "%1.1f second(s)"
-msgstr "%1.1f 秒"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
+msgid "Brightness Up"
+msgstr "亮度增加"
 
-#: src/modules/conf_display/e_int_config_dpms.c:227
-msgid "Dimming"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
+msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_display/e_mod_main.c:21
-#: src/modules/tiling/e_mod_config.c:198
-msgid "Virtual Desktops"
-msgstr "虚拟桌面"
-
-#: src/modules/conf_display/e_mod_main.c:28
-msgid "Screen Lock"
-msgstr "屏幕锁定"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
+msgid "S1"
+msgstr "S1"
 
-#: src/modules/conf_display/e_mod_main.c:44
-msgid "Desk"
-msgstr "桌面"
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
+msgid "Vaio"
+msgstr "Vaio"
 
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:4
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
 #: src/modules/conf_bindings/e_int_config_keybindings.c:3
 #: src/modules/conf_bindings/e_int_config_keybindings.c:7
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
 msgid "<None>"
 msgstr "<无>"
 
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
+msgid "ACPI Binding"
+msgstr "ACPI 绑定"
+
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
+#, fuzzy
+msgid ""
+"Please trigger the ACPI event you wish to bind to, <br><br>or "
+"<hilight>Escape</hilight> to abort."
+msgstr "请按下一个按键序列，或者按 <hilight>Esc 键</hilight> 中止。"
+
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
@@ -5413,39 +7046,23 @@ msgid "Modify"
 msgstr "修改"
 
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:277
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:780
 #: src/modules/conf_bindings/e_int_config_keybindings.c:255
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:780
 msgid "Delete All"
 msgstr "全部删除"
 
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:281
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:784
 #: src/modules/conf_bindings/e_int_config_keybindings.c:259
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:784
 msgid "Restore Default Bindings"
 msgstr "恢复默认绑定"
 
-#: src/modules/conf_bindings/e_int_config_edgebindings.c:286
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:789
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_bindings/e_int_config_keybindings.c:264
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
-msgid "Action"
-msgstr "动作"
-
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:293
 msgid "Mouse Button"
 msgstr "鼠标中键"
 
-#: src/modules/conf_bindings/e_int_config_edgebindings.c:299
-#: src/modules/conf_bindings/e_int_config_signalbindings.c:796
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_bindings/e_int_config_keybindings.c:271
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
-msgid "Action Params"
-msgstr "动作参数"
-
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "General Options"
 msgstr "常规选项"
@@ -5551,6 +7168,143 @@ msgstr "(左侧可点击)"
 msgid "(clickable)"
 msgstr "(可点击)"
 
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
+msgid "Single key"
+msgstr "启用单键"
+
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
+msgid "Key Bindings Settings"
+msgstr "键绑定设置"
+
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
+msgid "Key Bindings"
+msgstr "键绑定"
+
+#: src/modules/conf_bindings/e_int_config_keybindings.c:965
+msgid "Binding Key Error"
+msgstr "绑定按键错误"
+
+#: src/modules/conf_bindings/e_int_config_keybindings.c:966
+#, c-format
+msgid ""
+"The binding key sequence, that you choose, is already used by <br><hilight>"
+"%s</hilight> action.<br>Please choose another binding key sequence."
+msgstr ""
+"您选择的按键绑定序列，<br>已经被<hilight>%s</hilight>动作使用。<br>请选择其他"
+"按键绑定序列。"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
+msgid "Mouse Bindings Settings"
+msgstr "鼠标绑定设置"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
+msgid ""
+"Unable to set a mouse wheel binding without modifiers<br>on a window: "
+"conflict with existing edje signal bindings.<br>FIXME!!!"
+msgstr ""
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
+msgid "Mouse Binding Error"
+msgstr "鼠标绑定出错"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
+msgid "Mouse Bindings"
+msgstr "鼠标绑定"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
+msgid "Action Context"
+msgstr "动作上下文"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:380
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:384
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:388
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:392
+msgid "Any"
+msgstr "任意"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
+msgid "Win List"
+msgstr "窗口列表"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
+#: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
+msgid "Popup"
+msgstr "弹出"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
+msgid "Zone"
+msgstr "区域"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
+msgid "Container"
+msgstr "容器"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
+msgid "Manager"
+msgstr "管理器"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:695
+msgid "Mouse Buttons"
+msgstr "鼠标按键"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:755
+msgid "Mouse Wheels"
+msgstr "鼠标滚轮"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1128
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1146
+#: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
+#, c-format
+msgid "Left button"
+msgstr "左键"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1130
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1144
+#: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
+#, c-format
+msgid "Right button"
+msgstr "右键"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1133
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1149
+#: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
+#: src/modules/pager/e_mod_config.c:410
+#, c-format
+msgid "Button %i"
+msgstr "按键 %i"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1139
+#: src/modules/pager/e_mod_config.c:389
+#, c-format
+msgid "Middle button"
+msgstr "中键"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1161
+#, c-format
+msgid "Extra button (%d)"
+msgstr "额外按键(%d)"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1177
+msgid "Mouse Wheel Up"
+msgstr "鼠标滚轮向上"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1179
+msgid "Mouse Wheel Down"
+msgstr "鼠标滚轮向下"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#, c-format
+msgid "Extra Wheel (%d) Up"
+msgstr "额外滚轮(%d)向上"
+
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1185
+#, c-format
+msgid "Extra Wheel (%d) Down"
+msgstr "额外滚轮(%d)向下"
+
 #: src/modules/conf_bindings/e_int_config_signalbindings.c:561
 #: src/modules/conf_bindings/e_int_config_signalbindings.c:571
 msgid "Signal Binding Error"
@@ -5596,22 +7350,6 @@ msgstr "信号绑定设置"
 msgid "Input"
 msgstr "输入"
 
-#: src/modules/conf_bindings/e_mod_main.c:21
-#: src/modules/conf_bindings/e_int_config_keybindings.c:239
-msgid "Key Bindings"
-msgstr "键绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:25
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
-msgid "Mouse Bindings"
-msgstr "鼠标绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:29
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
-msgid "ACPI Bindings"
-msgstr "ACPI 绑定"
-
 #: src/modules/conf_bindings/e_mod_main.c:50
 #, fuzzy
 msgid "key bindings"
@@ -5622,31 +7360,6 @@ msgstr "键绑定"
 msgid "Key binding settings"
 msgstr "键绑定设置"
 
-#: src/modules/conf_bindings/e_mod_main.c:50
-#: src/modules/conf_bindings/e_mod_main.c:53
-#: src/modules/conf_bindings/e_mod_main.c:56
-#: src/modules/conf_bindings/e_mod_main.c:60
-#: src/modules/conf_bindings/e_mod_main.c:63
-#: src/modules/conf_intl/e_mod_main.c:45 src/modules/xkbswitch/e_mod_main.c:83
-#, fuzzy
-msgid "input"
-msgstr "输入"
-
-#: src/modules/conf_bindings/e_mod_main.c:50
-#: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
-#: src/modules/xkbswitch/e_mod_main.c:83
-msgid "key"
-msgstr ""
-
-#: src/modules/conf_bindings/e_mod_main.c:50
-#: src/modules/conf_bindings/e_mod_main.c:53
-#: src/modules/conf_bindings/e_mod_main.c:56
-#: src/modules/conf_bindings/e_mod_main.c:60
-#: src/modules/conf_bindings/e_mod_main.c:63
-#, fuzzy
-msgid "binding"
-msgstr "ACPI 绑定"
-
 #: src/modules/conf_bindings/e_mod_main.c:53
 #, fuzzy
 msgid "mouse bindings"
@@ -5657,12 +7370,6 @@ msgstr "鼠标绑定"
 msgid "Mouse binding settings"
 msgstr "鼠标绑定设置"
 
-#: src/modules/conf_bindings/e_mod_main.c:53
-#: src/modules/conf_bindings/e_mod_main.c:63
-#, fuzzy
-msgid "mouse"
-msgstr "鼠标"
-
 #: src/modules/conf_bindings/e_mod_main.c:56
 #, fuzzy
 msgid "ACPI bindings"
@@ -5687,19 +7394,6 @@ msgstr "边缘绑定"
 msgid "Screen edge binding settings"
 msgstr "边缘绑定设置"
 
-#: src/modules/conf_bindings/e_mod_main.c:60
-msgid "edge"
-msgstr ""
-
-#: src/modules/conf_bindings/e_mod_main.c:60
-#: src/modules/conf_randr/e_mod_main.c:31
-#: src/modules/notification/e_mod_main.c:245
-#: src/modules/notification/e_mod_main.c:249
-#: src/modules/notification/e_mod_main.c:274
-#, fuzzy
-msgid "screen"
-msgstr "屏幕"
-
 #: src/modules/conf_bindings/e_mod_main.c:63
 #, fuzzy
 msgid "signal bindings"
@@ -5710,10 +7404,620 @@ msgstr "信号绑定"
 msgid "Edje signal binding settings"
 msgstr "信号绑定设置"
 
-#: src/modules/conf_bindings/e_mod_main.c:63
-msgid "edje"
+#: src/modules/conf_comp/e_mod_config.c:88
+msgid "Composite Settings"
+msgstr "混成设置"
+
+#: src/modules/conf_comp/e_mod_config.c:188
+#, fuzzy
+msgid "Edit window matches"
+msgstr "最大宽度"
+
+#: src/modules/conf_comp/e_mod_config.c:191
+#: src/modules/conf_comp/e_mod_config.c:567
+msgid "Select default style"
+msgstr "选择默认样式"
+
+#: src/modules/conf_comp/e_mod_config.c:197
+msgid "Styles"
+msgstr "样式"
+
+#: src/modules/conf_comp/e_mod_config.c:202
+msgid "Smooth scaling"
+msgstr "平滑缩放"
+
+#: src/modules/conf_comp/e_mod_config.c:207
+#, fuzzy
+msgid "Fast Effects"
+msgstr "效果"
+
+#: src/modules/conf_comp/e_mod_config.c:208
+#, fuzzy
+msgid "Enable fast composite effects for windows"
+msgstr "不混合全屏窗口"
+
+#: src/modules/conf_comp/e_mod_config.c:211
+msgid "Enable fast composite effects for menus"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:214
+msgid "Enable fast composite effects for popups"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:217
+#, fuzzy
+msgid "Enable fast composite effects for objects"
+msgstr "不混合全屏窗口"
+
+#: src/modules/conf_comp/e_mod_config.c:220
+msgid "Enable fast composite effects for overrides"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:225
+#, fuzzy
+msgid "Disable Effects"
+msgstr "空闲效果"
+
+#: src/modules/conf_comp/e_mod_config.c:238
+msgid "Disable composite effects for overrides"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:241
+msgid "Disable composite effects for screen"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:246
+msgid "Effects"
+msgstr "效果"
+
+#: src/modules/conf_comp/e_mod_config.c:250
+msgid "Sync windows"
+msgstr "同步窗口"
+
+#: src/modules/conf_comp/e_mod_config.c:252
+msgid "Loose sync"
+msgstr "宽松同步"
+
+#: src/modules/conf_comp/e_mod_config.c:254
+msgid "Grab Server during draw"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:256
+msgid "Initial draw timeout for newly mapped windows"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:258
+#, c-format
+msgid "%1.2f Seconds"
+msgstr "%1.2f 秒"
+
+#: src/modules/conf_comp/e_mod_config.c:260
+msgid "Sync"
+msgstr "同步"
+
+#: src/modules/conf_comp/e_mod_config.c:265
+#: src/modules/conf_comp/e_mod_config.c:580
+msgid "Software"
+msgstr "软件"
+
+#: src/modules/conf_comp/e_mod_config.c:271
+#: src/modules/conf_comp/e_mod_config.c:586
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/modules/conf_comp/e_mod_config.c:274
+msgid "OpenGL options"
+msgstr "OpenGL 选项"
+
+#: src/modules/conf_comp/e_mod_config.c:276
+#: src/modules/conf_comp/e_mod_config.c:543
+msgid "Tear-free updates (VSynced)"
+msgstr "Tear-free 更新(VSynced)"
+
+#: src/modules/conf_comp/e_mod_config.c:278
+msgid "Texture from pixmap"
+msgstr "使用位图纹理"
+
+#: src/modules/conf_comp/e_mod_config.c:285
+msgid "Assume swapping method:"
+msgstr "默认交换方法："
+
+#: src/modules/conf_comp/e_mod_config.c:288
+msgid "Auto"
+msgstr "自动"
+
+#: src/modules/conf_comp/e_mod_config.c:290
+msgid "Invalidate (full redraw)"
+msgstr "设置无效(完全重绘)"
+
+#: src/modules/conf_comp/e_mod_config.c:292
+msgid "Copy from back to front"
+msgstr "从后方复制到前方"
+
+#: src/modules/conf_comp/e_mod_config.c:294
+msgid "Double buffered swaps"
+msgstr "双重缓冲"
+
+#: src/modules/conf_comp/e_mod_config.c:296
+msgid "Triple buffered swaps"
+msgstr "三重缓冲"
+
+#: src/modules/conf_comp/e_mod_config.c:306
+#: src/modules/conf_performance/e_mod_main.c:19
+msgid "Engine"
+msgstr "引擎"
+
+#: src/modules/conf_comp/e_mod_config.c:310
+msgid "Send flush"
+msgstr "发送刷新"
+
+#: src/modules/conf_comp/e_mod_config.c:312
+msgid "Send dump"
+msgstr "发送转储"
+
+#: src/modules/conf_comp/e_mod_config.c:342
+msgid "Memory"
+msgstr "内存"
+
+#: src/modules/conf_comp/e_mod_config.c:390
+msgid "Show Framerate"
+msgstr "显示帧率"
+
+#: src/modules/conf_comp/e_mod_config.c:392
+msgid "Rolling average frame count"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:394
+#, c-format
+msgid "%1.0f Frames"
+msgstr "%1.0f 帧"
+
+#: src/modules/conf_comp/e_mod_config.c:398
+msgid "Corner"
+msgstr "角"
+
+#: src/modules/conf_comp/e_mod_config.c:401
+msgid "Top Left"
+msgstr "左上"
+
+#: src/modules/conf_comp/e_mod_config.c:404
+msgid "Top Right"
+msgstr "右上"
+
+#: src/modules/conf_comp/e_mod_config.c:407
+msgid "Bottom Left"
+msgstr "左下"
+
+#: src/modules/conf_comp/e_mod_config.c:410
+msgid "Bottom Right"
+msgstr "右下"
+
+#: src/modules/conf_comp/e_mod_config.c:415
+msgid "Debug"
+msgstr "调试"
+
+#: src/modules/conf_comp/e_mod_config.c:546
+msgid "Smooth scaling of window content"
+msgstr "窗口内容平滑缩放"
+
+#: src/modules/conf_comp/e_mod_config.c:554
+msgid "Enable \"fast\" composite effects"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:563 src/modules/wizard/page_150.c:91
+msgid "Disable composite effects"
+msgstr ""
+
+#: src/modules/conf_comp/e_mod_config.c:590
+msgid "To reset compositor:"
+msgstr "重置合成器："
+
+#: src/modules/conf_comp/e_mod_config.c:592
+msgid "Ctrl+Alt+Shift+Home"
+msgstr "Ctrl+Alt+Shift+Home"
+
+#: src/modules/conf_comp/e_mod_config.c:595
+msgid "Rendering"
+msgstr "渲染"
+
+#: src/modules/conf_comp/e_mod_main.c:28
+#: src/modules/conf_comp/e_mod_main.c:233
+#: src/modules/conf_comp/e_mod_main.c:242
+msgid "Composite"
+msgstr "混成"
+
+#: src/modules/conf_comp/e_mod_main.c:238
+#, fuzzy
+msgid "Composite Style Settings"
+msgstr "混成设置"
+
+#: src/modules/conf_comp/e_mod_main.c:259
+#, fuzzy
+msgid "comp_settings"
+msgstr "混成设置"
+
+#: src/modules/conf_comp/e_mod_main.c:259
+#, fuzzy
+msgid "Advanced composite settings panel"
+msgstr "混成设置"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:38
+msgid "Dialog Settings"
+msgstr "对话框设置"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:109
+#: src/modules/conf_performance/e_int_config_engine.c:86
+#: src/modules/conf_theme/e_int_config_fonts.c:674
+#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:97
+#: src/modules/mixer/conf_gadget.c:192 src/modules/mixer/conf_module.c:91
+msgid "General Settings"
+msgstr "常规设置"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:111
+msgid "Disable Confirmation Dialogs"
+msgstr "禁用确认对话框"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:113
+msgid "Normal Windows"
+msgstr "正常窗口"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:120
+msgid "Default Settings Dialogs Mode"
+msgstr "对话框模式默认模式"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:122
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:166
+msgid "Basic Mode"
+msgstr "基本模式"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:124
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:168
+msgid "Advanced Mode"
+msgstr "高级模式"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:129
+msgid "Remember size and position of dialogs"
+msgstr "记住对话框的位置和尺寸"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:163
+msgid "Default Dialog Mode"
+msgstr "默认对话框模式"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:53
+msgid "Profile Selector"
+msgstr "用户环境选择器"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:106
+msgid "Available Profiles"
+msgstr "可用用户环境"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:122
+#: src/modules/wizard/page_020.c:115
+msgid "Select a profile"
+msgstr "选择一个配置文件"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:138
+msgid "Scratch"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:141
+msgid "Reset"
+msgstr "重置"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:292
+#, c-format
+msgid "Selected profile: %s"
+msgstr "选择一个配置文件：%s"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:315
+msgid "Add New Profile"
+msgstr "添加新用户环境"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:336
+#, c-format
+msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
+msgstr "即将删除“%s”配置文件。<br><br>您确定要删除吗？"
+
+#: src/modules/conf_dialogs/e_int_config_profiles.c:338
+msgid "Are you sure you want to delete this profile?"
+msgstr "您确定要删除这个用户环境？"
+
+#: src/modules/conf_dialogs/e_mod_main.c:18
+msgid "Dialogs"
+msgstr "对话框"
+
+#: src/modules/conf_dialogs/e_mod_main.c:19
+msgid "Profiles"
+msgstr "用户环境"
+
+#: src/modules/conf_dialogs/e_mod_main.c:28
+#, fuzzy
+msgid "profiles"
+msgstr "用户环境"
+
+#: src/modules/conf_dialogs/e_mod_main.c:28
+#, fuzzy
+msgid "Enlightenment profile settings"
+msgstr "Enlightenment 无法设定它的记忆设置。\n"
+
+#: src/modules/conf_display/e_int_config_desk.c:54
+msgid "Desk Settings"
+msgstr "桌面设置"
+
+#: src/modules/conf_display/e_int_config_desk.c:192
+#: src/modules/conf_display/e_int_config_desks.c:230
+msgid "Desktop Window Profile"
+msgstr "桌面窗口配置"
+
+#: src/modules/conf_display/e_int_config_desk.c:193
+#, fuzzy
+msgid "Profile name"
+msgstr "配置名称:"
+
+#: src/modules/conf_display/e_int_config_desk.c:200
+#: src/modules/conf_display/e_int_config_desklock.c:357
+#: src/modules/conf_theme/e_mod_main.c:29
+#: src/modules/conf_theme/e_mod_main.c:118
+#: src/modules/conf_theme/e_mod_main.c:125
+#: src/modules/conf_theme/e_mod_main.c:154
+msgid "Wallpaper"
+msgstr "壁纸"
+
+#: src/modules/conf_display/e_int_config_desk.c:206
+#: src/modules/fileman/e_int_config_mime.c:184
+msgid "Set"
+msgstr "设定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:77
+msgid "Screen Lock Settings"
+msgstr "屏幕锁定设置"
+
+#: src/modules/conf_display/e_int_config_desklock.c:197
+msgid "Lock on Startup"
+msgstr "启动时锁定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:200
+msgid "Lock on Suspend"
+msgstr "挂起时锁定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:204
+msgid "Custom Screenlock Command"
+msgstr "自定义屏幕锁定命令"
+
+#: src/modules/conf_display/e_int_config_desklock.c:208
+msgid "Use Custom Screenlock Command"
+msgstr "使用自定义屏幕锁定命令"
+
+#: src/modules/conf_display/e_int_config_desklock.c:211
+msgid "Locking"
+msgstr "锁定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:253
+msgid "Keyboard Layout"
+msgstr "键盘布局"
+
+#: src/modules/conf_display/e_int_config_desklock.c:259
+msgid "Show on all screens"
+msgstr "显示到所有屏幕"
+
+#: src/modules/conf_display/e_int_config_desklock.c:264
+msgid "Show on current screen"
+msgstr "显示在当前屏幕"
+
+#: src/modules/conf_display/e_int_config_desklock.c:269
+msgid "Show on screen #:"
+msgstr "显示在屏幕 #:"
+
+#: src/modules/conf_display/e_int_config_desklock.c:275
+#: src/modules/conf_display/e_int_config_desks.c:208
+#: src/modules/conf_display/e_int_config_desks.c:213
+#: src/modules/conf_interaction/e_int_config_mouse.c:207
+#: src/modules/conf_interaction/e_int_config_mouse.c:213
+#: src/modules/everything/evry_config.c:405
+#: src/modules/everything/evry_config.c:547
+#: src/modules/everything/evry_config.c:554
+#: src/modules/everything/evry_config.c:580
+#: src/modules/everything/evry_config.c:587
+#: src/modules/fileman/e_mod_config.c:326
+#: src/modules/syscon/e_int_config_syscon.c:148
+#: src/modules/syscon/e_int_config_syscon.c:153
+#: src/modules/syscon/e_int_config_syscon.c:158
+#: src/modules/tiling/e_mod_config.c:129
+#, c-format
+msgid "%1.0f"
+msgstr "%1.0f"
+
+#: src/modules/conf_display/e_int_config_desklock.c:279
+msgid "Login Box"
+msgstr "登录框"
+
+#: src/modules/conf_display/e_int_config_desklock.c:284
+msgid "Lock after X screensaver activates"
+msgstr "当屏幕保护程序运行时锁定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:289
+#: src/modules/conf_display/e_int_config_desklock.c:312
+#: src/modules/conf_display/e_int_config_screensaver.c:174
+#: src/modules/conf_display/e_int_config_screensaver.c:187
+#: src/modules/fileman/e_mod_config.c:415 src/modules/fileman/e_mod_main.c:445
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f 秒"
+
+#: src/modules/conf_display/e_int_config_desklock.c:296
+msgid "Lock when idle time exceeded"
+msgstr "空闲指定时间后锁定"
+
+#: src/modules/conf_display/e_int_config_desklock.c:300
+#: src/modules/conf_display/e_int_config_screensaver.c:157
+#, c-format
+msgid "%1.0f minutes"
+msgstr "%1.0f 分"
+
+#: src/modules/conf_display/e_int_config_desklock.c:304
+msgid "Timers"
+msgstr "计时器"
+
+#: src/modules/conf_display/e_int_config_desklock.c:309
+#: src/modules/conf_display/e_int_config_screensaver.c:183
+msgid "Suggest if deactivated before"
+msgstr "在禁用前提示"
+
+#: src/modules/conf_display/e_int_config_desklock.c:316
+msgid "Presentation Mode"
+msgstr "演示模式"
+
+#: src/modules/conf_display/e_int_config_desklock.c:323
+#: src/modules/gadman/e_mod_config.c:210
+msgid "Theme Defined"
+msgstr "已定义主题"
+
+#: src/modules/conf_display/e_int_config_desklock.c:327
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:723
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:916
+msgid "Theme Wallpaper"
+msgstr "主题壁纸"
+
+#: src/modules/conf_display/e_int_config_desklock.c:331
+msgid "Current Wallpaper"
+msgstr "当前壁纸"
+
+#: src/modules/conf_display/e_int_config_desklock_fsel.c:41
+msgid "Select a Background..."
+msgstr "选择背景..."
+
+#: src/modules/conf_display/e_int_config_desklock_fsel.c:84
+#: src/modules/conf_intl/e_int_config_imc.c:803
+#: src/modules/conf_theme/e_int_config_startup.c:268
+#: src/modules/conf_theme/e_int_config_theme.c:728
+#: src/modules/conf_theme/e_int_config_theme.c:1103
+#: src/modules/conf_theme/e_int_config_theme.c:1112
+#: src/modules/conf_theme/e_int_config_wallpaper.c:423
+#: src/modules/conf_theme/e_int_config_wallpaper.c:577
+#: src/modules/gadman/e_mod_config.c:248
+msgid "Personal"
+msgstr "个人"
+
+#: src/modules/conf_display/e_int_config_desks.c:51
+#: src/modules/pager/e_mod_main.c:886
+msgid "Virtual Desktops Settings"
+msgstr "虚拟桌面设置"
+
+#: src/modules/conf_display/e_int_config_desks.c:198
+msgid "Number of Desktops"
+msgstr "桌面数目"
+
+#: src/modules/conf_display/e_int_config_desks.c:201
+msgid "Click to change wallpaper"
+msgstr "点击更改壁纸"
+
+#: src/modules/conf_display/e_int_config_desks.c:220
+msgid "Desktop Flip"
+msgstr "桌面翻转"
+
+#: src/modules/conf_display/e_int_config_desks.c:221
+msgid "Flip when dragging objects to the screen edge"
+msgstr "拖拽对象到屏幕边缘时翻转"
+
+#: src/modules/conf_display/e_int_config_desks.c:224
+msgid "Wrap desktops around when flipping"
+msgstr "翻转时反转桌面？"
+
+#: src/modules/conf_display/e_int_config_desks.c:232
+msgid "Use desktop window profile"
+msgstr "使用桌面窗口配置"
+
+#: src/modules/conf_display/e_int_config_desks.c:238
+msgid "Desktops"
+msgstr "桌面"
+
+#: src/modules/conf_display/e_int_config_desks.c:257
+msgid "Flip Animation"
+msgstr "翻转动画"
+
+#: src/modules/conf_display/e_int_config_dpms.c:57
+msgid "Backlight Settings"
+msgstr "背光设置"
+
+#: src/modules/conf_display/e_int_config_dpms.c:175
+msgid "Normal Backlight"
+msgstr "正常背光"
+
+#: src/modules/conf_display/e_int_config_dpms.c:177
+#: src/modules/conf_display/e_int_config_dpms.c:183
+#, c-format
+msgid "%3.0f"
+msgstr "%3.0f"
+
+#: src/modules/conf_display/e_int_config_dpms.c:181
+msgid "Dim Backlight"
+msgstr "降低背光"
+
+#: src/modules/conf_display/e_int_config_dpms.c:187
+msgid "Idle Fade Time"
+msgstr "空闲淡出时间"
+
+#: src/modules/conf_display/e_int_config_dpms.c:190
+#, c-format
+msgid "%1.0f second(s)"
+msgstr "%1.0f 秒"
+
+#: src/modules/conf_display/e_int_config_dpms.c:196
+msgid "Fade Time"
+msgstr "渐变时间"
+
+#: src/modules/conf_display/e_int_config_dpms.c:198
+#, c-format
+msgid "%1.1f second(s)"
+msgstr "%1.1f 秒"
+
+#: src/modules/conf_display/e_int_config_dpms.c:227
+msgid "Dimming"
 msgstr ""
 
+#: src/modules/conf_display/e_int_config_screensaver.c:54
+msgid "Screen Saver Settings"
+msgstr "屏幕保护程序设置"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:150
+msgid "Enable screen blanking"
+msgstr "开启屏幕空白"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:154
+#: src/modules/syscon/e_int_config_syscon.c:167
+msgid "Timeout"
+msgstr "超时"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:162
+msgid "Suspend on blank"
+msgstr "当屏幕空白时挂起"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:166
+msgid "Suspend even if AC"
+msgstr "使用交流电源时仍然挂起"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:171
+msgid "Suspend delay"
+msgstr "挂起延迟"
+
+#: src/modules/conf_display/e_int_config_screensaver.c:179
+#: src/modules/conf_display/e_mod_main.c:32
+msgid "Blanking"
+msgstr "空白"
+
+#: src/modules/conf_display/e_mod_main.c:21
+#: src/modules/tiling/e_mod_config.c:198
+msgid "Virtual Desktops"
+msgstr "虚拟桌面"
+
+#: src/modules/conf_display/e_mod_main.c:28
+msgid "Screen Lock"
+msgstr "屏幕锁定"
+
+#: src/modules/conf_display/e_mod_main.c:44
+msgid "Desk"
+msgstr "桌面"
+
 #: src/modules/conf_interaction/e_int_config_interaction.c:36
 msgid "Interaction Settings"
 msgstr "交互设置"
@@ -5951,232 +8255,6 @@ msgstr "输入法错误"
 msgid "Input method settings"
 msgstr "输入法设置"
 
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
-msgid "AC Adapter Unplugged"
-msgstr "电源适配器拔出"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
-msgid "AC Adapter Plugged"
-msgstr "电源适配器插入"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
-msgid "Ac Adapter"
-msgstr "电源适配器"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
-msgid "Button"
-msgstr "按钮"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
-msgid "Fan"
-msgstr "风扇"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
-msgid "Lid Unknown"
-msgstr "盖子未知"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
-msgid "Lid Closed"
-msgstr "盖子关闭"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
-msgid "Lid Opened"
-msgstr "盖子打开"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
-msgid "Lid"
-msgstr "盖子"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
-msgid "Power Button"
-msgstr "电源按钮"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
-msgid "Processor"
-msgstr "处理器"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
-msgid "Sleep Button"
-msgstr "休眠按钮"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
-msgid "Thermal"
-msgstr "散热"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
-msgid "Video"
-msgstr "视频"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
-msgid "Wifi"
-msgstr "Wifi"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
-msgid "Zoom Out"
-msgstr "缩小"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
-msgid "Zoom In"
-msgstr "放大"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
-msgid "Brightness Down"
-msgstr "亮度降低"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
-msgid "Brightness Up"
-msgstr "亮度增加"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
-msgid "Assist"
-msgstr ""
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
-msgid "S1"
-msgstr "S1"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
-msgid "Vaio"
-msgstr "Vaio"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
-msgid "ACPI Binding"
-msgstr "ACPI 绑定"
-
-#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
-#, fuzzy
-msgid ""
-"Please trigger the ACPI event you wish to bind to, <br><br>or "
-"<hilight>Escape</hilight> to abort."
-msgstr "请按下一个按键序列，或者按 <hilight>Esc 键</hilight> 中止。"
-
-#: src/modules/conf_bindings/e_int_config_keybindings.c:8
-msgid "Single key"
-msgstr "启用单键"
-
-#: src/modules/conf_bindings/e_int_config_keybindings.c:106
-msgid "Key Bindings Settings"
-msgstr "键绑定设置"
-
-#: src/modules/conf_bindings/e_int_config_keybindings.c:965
-msgid "Binding Key Error"
-msgstr "绑定按键错误"
-
-#: src/modules/conf_bindings/e_int_config_keybindings.c:966
-#, c-format
-msgid ""
-"The binding key sequence, that you choose, is already used by <br><hilight>"
-"%s</hilight> action.<br>Please choose another binding key sequence."
-msgstr ""
-"您选择的按键绑定序列，<br>已经被<hilight>%s</hilight>动作使用。<br>请选择其他"
-"按键绑定序列。"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
-msgid "Mouse Bindings Settings"
-msgstr "鼠标绑定设置"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
-msgid ""
-"Unable to set a mouse wheel binding without modifiers<br>on a window: "
-"conflict with existing edje signal bindings.<br>FIXME!!!"
-msgstr ""
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
-msgid "Mouse Binding Error"
-msgstr "鼠标绑定出错"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
-msgid "Action Context"
-msgstr "动作上下文"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:380
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:384
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:388
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:392
-msgid "Any"
-msgstr "任意"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
-msgid "Win List"
-msgstr "窗口列表"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
-#: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
-msgid "Popup"
-msgstr "弹出"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
-msgid "Zone"
-msgstr "区域"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
-msgid "Container"
-msgstr "容器"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
-msgid "Manager"
-msgstr "管理器"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:695
-msgid "Mouse Buttons"
-msgstr "鼠标按键"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:755
-msgid "Mouse Wheels"
-msgstr "鼠标滚轮"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1128
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1146
-#: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
-#, c-format
-msgid "Left button"
-msgstr "左键"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1130
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1144
-#: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
-#, c-format
-msgid "Right button"
-msgstr "右键"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1133
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1149
-#: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
-#: src/modules/pager/e_mod_config.c:410
-#, c-format
-msgid "Button %i"
-msgstr "按键 %i"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1139
-#: src/modules/pager/e_mod_config.c:389
-#, c-format
-msgid "Middle button"
-msgstr "中键"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1161
-#, c-format
-msgid "Extra button (%d)"
-msgstr "额外按键(%d)"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1177
-msgid "Mouse Wheel Up"
-msgstr "鼠标滚轮向上"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1179
-msgid "Mouse Wheel Down"
-msgstr "鼠标滚轮向下"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
-#, c-format
-msgid "Extra Wheel (%d) Up"
-msgstr "额外滚轮(%d)向上"
-
-#: src/modules/conf_bindings/e_int_config_mousebindings.c:1185
-#, c-format
-msgid "Extra Wheel (%d) Down"
-msgstr "额外滚轮(%d)向下"
-
 #: src/modules/conf_menus/e_int_config_menus.c:38
 #: src/modules/conf_menus/e_mod_main.c:18
 msgid "Menu Settings"
@@ -6251,11 +8329,6 @@ msgstr "鼠标指针边距"
 msgid "Autoscroll"
 msgstr "自动滚动"
 
-#: src/modules/conf_menus/e_int_config_menus.c:302
-#, fuzzy
-msgid "Disable icons in menus"
-msgstr "禁用移动"
-
 #: src/modules/conf_menus/e_int_config_menus.c:304
 msgid "Menu Scroll Speed"
 msgstr "菜单滚动速度"
@@ -6287,10 +8360,19 @@ msgstr "%2.2f 秒"
 
 #: src/modules/conf_menus/e_int_config_menus.c:319
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:364
-#: src/modules/notification/e_mod_config.c:149
+#: src/modules/notification/e_mod_config.c:161
 msgid "Miscellaneous"
 msgstr "杂项"
 
+#: src/modules/conf_paths/e_int_config_env.c:36
+#: src/modules/conf_paths/e_mod_main.c:24
+msgid "Environment Variables"
+msgstr "环境变量"
+
+#: src/modules/conf_paths/e_int_config_env.c:306
+msgid "Unset"
+msgstr "取消设置"
+
 #: src/modules/conf_paths/e_int_config_paths.c:59
 msgid "Search Path Settings"
 msgstr "搜索路径设置"
@@ -6311,6 +8393,7 @@ msgstr "字体"
 
 #: src/modules/conf_paths/e_int_config_paths.c:76
 #: src/modules/conf_theme/e_int_config_theme.c:1394
+#: src/modules/conf_theme/e_mod_main.c:99
 msgid "Themes"
 msgstr "主题"
 
@@ -6341,15 +8424,6 @@ msgstr "默认目录"
 msgid "User Defined Directories"
 msgstr "用户自定义目录"
 
-#: src/modules/conf_paths/e_int_config_env.c:36
-#: src/modules/conf_paths/e_mod_main.c:24
-msgid "Environment Variables"
-msgstr "环境变量"
-
-#: src/modules/conf_paths/e_int_config_env.c:306
-msgid "Unset"
-msgstr "取消设置"
-
 #: src/modules/conf_paths/e_mod_main.c:20
 msgid "Search Directories"
 msgstr "搜索目录"
@@ -6364,12 +8438,6 @@ msgstr "搜索目录"
 msgid "Search directory settings"
 msgstr "搜索目录"
 
-#: src/modules/conf_paths/e_mod_main.c:35
-#: src/modules/conf_paths/e_mod_main.c:38
-#, fuzzy
-msgid "environment"
-msgstr "桌面环境"
-
 #: src/modules/conf_paths/e_mod_main.c:38
 #, fuzzy
 msgid "environment variables"
@@ -6384,11 +8452,6 @@ msgstr "环境变量"
 msgid "Engine Settings"
 msgstr "引擎设定"
 
-#: src/modules/conf_performance/e_int_config_engine.c:87
-#: src/modules/conf_performance/e_int_config_engine.c:108
-msgid "Use shaped windows instead of ARGB"
-msgstr ""
-
 #: src/modules/conf_performance/e_int_config_engine.c:110
 #, fuzzy
 msgid ""
@@ -6402,10 +8465,6 @@ msgstr ""
 msgid "Performance Settings"
 msgstr "性能设置"
 
-#: src/modules/conf_performance/e_int_config_performance.c:107
-msgid "Framerate"
-msgstr "帧速率"
-
 #: src/modules/conf_performance/e_int_config_performance.c:109
 #, c-format
 msgid "%1.0f fps"
@@ -6423,19 +8482,11 @@ msgstr "允许模块加载延迟"
 msgid "Cache flush interval"
 msgstr "缓存刷新间隔"
 
-#: src/modules/conf_performance/e_int_config_performance.c:132
-msgid "Font cache size"
-msgstr "字体缓存大小"
-
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #, c-format
 msgid "%1.1f MiB"
 msgstr "%1.1f MiB"
 
-#: src/modules/conf_performance/e_int_config_performance.c:138
-msgid "Image cache size"
-msgstr "图片缓存大小"
-
 #: src/modules/conf_performance/e_int_config_performance.c:140
 #: src/modules/fileman/e_mod_config.c:409 src/modules/fileman/e_mod_main.c:439
 #, c-format
@@ -6496,14 +8547,21 @@ msgstr "级别"
 msgid "e.g. Saving to disk"
 msgstr "例如：保存到磁盘"
 
+#: src/modules/conf_performance/e_int_config_powermanagement.c:204
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:287
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:241
+#, c-format
+msgid "%1.1f s"
+msgstr "%1.1f s"
+
 #: src/modules/conf_performance/e_int_config_powermanagement.c:235
-#: src/modules/shot/e_mod_main.c:729
 #: src/modules/notification/e_mod_config.c:102
+#: src/modules/shot/e_mod_main.c:726
 msgid "Low"
 msgstr "低"
 
 #: src/modules/conf_performance/e_int_config_powermanagement.c:274
-#: src/modules/shot/e_mod_main.c:727
+#: src/modules/shot/e_mod_main.c:724
 msgid "Medium"
 msgstr "中等"
 
@@ -6515,7 +8573,7 @@ msgid "%.0f s"
 msgstr "%.0f 秒"
 
 #: src/modules/conf_performance/e_int_config_powermanagement.c:313
-#: src/modules/shot/e_mod_main.c:725
+#: src/modules/shot/e_mod_main.c:722
 msgid "High"
 msgstr "高"
 
@@ -6549,23 +8607,17 @@ msgstr ""
 msgid "Screen resolution and orientation settings"
 msgstr ""
 
-#: src/modules/conf_randr/e_mod_main.c:31 src/modules/fileman/e_mod_main.c:416
-#: src/modules/fileman/e_mod_main.c:438
-#, fuzzy
-msgid "size"
-msgstr "改变大小"
-
-#: src/modules/conf_shelves/e_int_config_shelf.c:127
+#: src/modules/conf_shelves/e_int_config_shelf.c:129
 #, fuzzy, c-format
 msgid "Configured Shelves: Display %d"
 msgstr "设置书架: 显示"
 
-#: src/modules/conf_shelves/e_int_config_shelf.c:388
+#: src/modules/conf_shelves/e_int_config_shelf.c:390
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "确定要删除 %s？"
 
-#: src/modules/conf_shelves/e_int_config_shelf.c:391
+#: src/modules/conf_shelves/e_int_config_shelf.c:393
 msgid "Confirm Shelf Deletion"
 msgstr "确认删除书架"
 
@@ -6579,51 +8631,6 @@ msgstr "书架"
 msgid "Shelf settings"
 msgstr "书架设定"
 
-#: src/modules/conf_shelves/e_mod_main.c:38
-#, fuzzy
-msgid "shelf"
-msgstr "书架"
-
-#: src/modules/conf_shelves/e_mod_main.c:38
-#, fuzzy
-msgid "desktop"
-msgstr "桌面"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:103
-msgid "Wallpaper Settings"
-msgstr "壁纸设置"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:433
-#: src/modules/conf_theme/e_int_config_wallpaper.c:587
-msgid "Go up a directory"
-msgstr "向上一级目录"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:465
-#: src/modules/conf_theme/e_int_config_wallpaper.c:612
-msgid "Use Theme Wallpaper"
-msgstr "使用主题墙纸"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:470
-#: src/modules/conf_theme/e_int_config_wallpaper.c:617
-msgid "Picture..."
-msgstr "图片..."
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:633
-msgid "Where to place the Wallpaper"
-msgstr "壁纸位置"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:634
-msgid "All Desktops"
-msgstr "所有桌面"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:636
-msgid "This Desktop"
-msgstr "这个桌面"
-
-#: src/modules/conf_theme/e_int_config_wallpaper.c:638
-msgid "This Screen"
-msgstr "这个屏幕"
-
 #: src/modules/conf_theme/e_int_config_borders.c:30
 #: src/modules/conf_theme/e_int_config_borders.c:209
 msgid "Default Border Style"
@@ -7174,32 +9181,6 @@ msgstr "启动设置"
 msgid "Show Splash Screen on Login"
 msgstr "登录时显示飞溅屏幕"
 
-#: src/modules/conf_theme/e_int_config_transitions.c:46
-msgid "Transition Settings"
-msgstr "转换设置"
-
-#: src/modules/conf_theme/e_int_config_transitions.c:173
-msgid "Events"
-msgstr "事件"
-
-#: src/modules/conf_theme/e_int_config_transitions.c:181
-#: src/modules/conf_theme/e_mod_main.c:149
-msgid "Startup"
-msgstr "启动"
-
-#: src/modules/conf_theme/e_int_config_transitions.c:182
-msgid "Desk Change"
-msgstr "桌面更改"
-
-#: src/modules/conf_theme/e_int_config_transitions.c:183
-msgid "Background Change"
-msgstr "背景更改"
-
-#: src/modules/conf_theme/e_int_config_transitions.c:191
-#: src/modules/conf_theme/e_mod_main.c:143
-msgid "Transitions"
-msgstr "变换"
-
 #: src/modules/conf_theme/e_int_config_theme.c:369
 msgid "Theme Selector"
 msgstr "主题选择器"
@@ -7252,6 +9233,71 @@ 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_transitions.c:46
+msgid "Transition Settings"
+msgstr "转换设置"
+
+#: src/modules/conf_theme/e_int_config_transitions.c:173
+msgid "Events"
+msgstr "事件"
+
+#: src/modules/conf_theme/e_int_config_transitions.c:181
+#: src/modules/conf_theme/e_mod_main.c:149
+msgid "Startup"
+msgstr "启动"
+
+#: src/modules/conf_theme/e_int_config_transitions.c:182
+msgid "Desk Change"
+msgstr "桌面更改"
+
+#: src/modules/conf_theme/e_int_config_transitions.c:183
+msgid "Background Change"
+msgstr "背景更改"
+
+#: src/modules/conf_theme/e_int_config_transitions.c:191
+#: src/modules/conf_theme/e_mod_main.c:143
+msgid "Transitions"
+msgstr "变换"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:103
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1174
+msgid "Wallpaper Settings"
+msgstr "壁纸设置"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:433
+#: src/modules/conf_theme/e_int_config_wallpaper.c:587
+msgid "Go up a directory"
+msgstr "向上一级目录"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:465
+#: src/modules/conf_theme/e_int_config_wallpaper.c:612
+msgid "Use Theme Wallpaper"
+msgstr "使用主题墙纸"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:470
+#: src/modules/conf_theme/e_int_config_wallpaper.c:617
+msgid "Picture..."
+msgstr "图片..."
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:633
+msgid "Where to place the Wallpaper"
+msgstr "壁纸位置"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:634
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1252
+msgid "All Desktops"
+msgstr "所有桌面"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:636
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1258
+msgid "This Desktop"
+msgstr "这个桌面"
+
+#: src/modules/conf_theme/e_int_config_wallpaper.c:638
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1263
+msgid "This Screen"
+msgstr "这个屏幕"
+
 #: src/modules/conf_theme/e_int_config_xsettings.c:59
 msgid "Application Theme Settings"
 msgstr "应用程序主题设置"
@@ -7298,17 +9344,6 @@ msgstr "主题"
 msgid "Enlightenment theme settings"
 msgstr "Enlightenment 无法设定它的记忆设置。\n"
 
-#: src/modules/conf_theme/e_mod_main.c:168
-#: src/modules/conf_theme/e_mod_main.c:176
-#, fuzzy
-msgid "theme"
-msgstr "主题"
-
-#: src/modules/conf_theme/e_mod_main.c:172
-#, fuzzy
-msgid "wallpaper"
-msgstr "壁纸"
-
 #: src/modules/conf_theme/e_mod_main.c:172
 #, fuzzy
 msgid "Desktop wallpaper settings"
@@ -7339,9 +9374,17 @@ msgstr "字体"
 msgid "Enlightenment font settings"
 msgstr "Enlightenment 路径"
 
-#: src/modules/conf_theme/e_mod_main.c:180
-msgid "font"
-msgstr ""
+#: src/modules/conf_wallpaper2/e_int_config_wallpaper.c:1106
+#, fuzzy
+msgid "Loading files..."
+msgstr "正在删除文件..."
+
+#: src/modules/conf_wallpaper2/e_mod_main.c:23
+#: src/modules/conf_wallpaper2/e_mod_main.c:27
+#: src/modules/conf_wallpaper2/e_mod_main.c:91
+#, fuzzy
+msgid "Wallpaper 2"
+msgstr "壁纸"
 
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:38
 msgid "Window List Menu Settings"
@@ -7420,140 +9463,6 @@ msgstr "%1.0f 字符"
 msgid "Captions"
 msgstr "标题"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:44
-#: src/modules/conf_window_manipulation/e_mod_main.c:18
-msgid "Window Display"
-msgstr "窗口显示"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:130
-msgid "Border Icon"
-msgstr "边框图标"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:132
-msgid "User defined"
-msgstr "用户自定义"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:134
-msgid "Application provided"
-msgstr "应用程序提供的 "
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:138
-msgid "Move Geometry"
-msgstr "窗口移动几何"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:139
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:150
-msgid "Display information"
-msgstr "显示信息"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:142
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:153
-msgid "Follows the window"
-msgstr "跟随窗口"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:149
-msgid "Resize Geometry"
-msgstr "改变几何尺寸"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:159
-#: src/modules/fileman/e_mod_config.c:355
-#: src/modules/winlist/e_int_config_winlist.c:197
-#: src/modules/tasks/e_mod_config.c:86
-msgid "Display"
-msgstr "显示"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:164
-msgid "Placement"
-msgstr "放置"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:166
-msgid "Smart Placement"
-msgstr "智能放置"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:169
-msgid "Don't hide Gadgets"
-msgstr "不隐藏组件"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:172
-msgid "Place at mouse pointer"
-msgstr "放在鼠标处"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:175
-msgid "Place manually with the mouse"
-msgstr "鼠标手动放置"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:178
-msgid "Group with windows of the same application"
-msgstr ""
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:182
-msgid "Switch to desktop of new window"
-msgstr "切换到新窗口桌面"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:185
-msgid "New Windows"
-msgstr "新窗口"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:190
-msgid "Animate"
-msgstr "动画"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
-msgid "Linear"
-msgstr "线性"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:205
-msgid "Accelerate, then decelerate"
-msgstr "加速后减速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:209
-msgid "Accelerate"
-msgstr "加速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:213
-msgid "Decelerate"
-msgstr "减速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:217
-msgid "Pronounced Accelerate"
-msgstr "快速加速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
-msgid "Pronounced Decelerate"
-msgstr "快速减速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:225
-msgid "Pronounced Accelerate, then decelerate"
-msgstr "快速加速后减速"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:229
-msgid "Bounce"
-msgstr ""
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:233
-msgid "Bounce more"
-msgstr ""
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:237
-msgid "Shading"
-msgstr "阴影"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:245
-msgid "Keep windows within the visual screen limits"
-msgstr "保持窗口位于屏幕可见范围内"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:248
-msgid "Allow windows partly out of the visual screen limits"
-msgstr "允许窗口部分位于屏幕可见范围外"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:251
-msgid "Allow windows completely out of visual screen limits"
-msgstr "允许窗口完全位于屏幕可见范围外"
-
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:254
-msgid "Screen Limits"
-msgstr "屏幕范围"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:58
 msgid "Focus Settings"
 msgstr "焦点设置"
@@ -7659,10 +9568,6 @@ msgstr "提示"
 msgid "Warping"
 msgstr "分组"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:326
-msgid "Prevent all forms of pointer warping"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:329
 #, fuzzy
 msgid "Slide pointer to a new window which is focused"
@@ -7707,6 +9612,139 @@ msgstr "桌面切换时重聚焦上次的窗口"
 msgid "Focus last focused window on lost focus"
 msgstr "桌面切换时重聚焦上次的窗口"
 
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:44
+#: src/modules/conf_window_manipulation/e_mod_main.c:18
+msgid "Window Display"
+msgstr "窗口显示"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:130
+msgid "Border Icon"
+msgstr "边框图标"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:132
+msgid "User defined"
+msgstr "用户自定义"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:134
+msgid "Application provided"
+msgstr "应用程序提供的 "
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:138
+msgid "Move Geometry"
+msgstr "窗口移动几何"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:139
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:150
+msgid "Display information"
+msgstr "显示信息"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:153
+msgid "Follows the window"
+msgstr "跟随窗口"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:149
+msgid "Resize Geometry"
+msgstr "改变几何尺寸"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:159
+#: src/modules/fileman/e_mod_config.c:355 src/modules/tasks/e_mod_config.c:86
+#: src/modules/winlist/e_int_config_winlist.c:197
+msgid "Display"
+msgstr "显示"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:164
+msgid "Placement"
+msgstr "放置"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:166
+msgid "Smart Placement"
+msgstr "智能放置"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:169
+msgid "Don't hide Gadgets"
+msgstr "不隐藏组件"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:172
+msgid "Place at mouse pointer"
+msgstr "放在鼠标处"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:175
+msgid "Place manually with the mouse"
+msgstr "鼠标手动放置"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:178
+msgid "Group with windows of the same application"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:182
+msgid "Switch to desktop of new window"
+msgstr "切换到新窗口桌面"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:185
+msgid "New Windows"
+msgstr "新窗口"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:190
+msgid "Animate"
+msgstr "动画"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
+msgid "Linear"
+msgstr "线性"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:205
+msgid "Accelerate, then decelerate"
+msgstr "加速后减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:209
+msgid "Accelerate"
+msgstr "加速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:213
+msgid "Decelerate"
+msgstr "减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:217
+msgid "Pronounced Accelerate"
+msgstr "快速加速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221
+msgid "Pronounced Decelerate"
+msgstr "快速减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:225
+msgid "Pronounced Accelerate, then decelerate"
+msgstr "快速加速后减速"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:229
+msgid "Bounce"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:233
+msgid "Bounce more"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:237
+msgid "Shading"
+msgstr "阴影"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:245
+msgid "Keep windows within the visual screen limits"
+msgstr "保持窗口位于屏幕可见范围内"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:248
+msgid "Allow windows partly out of the visual screen limits"
+msgstr "允许窗口部分位于屏幕可见范围外"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:251
+msgid "Allow windows completely out of visual screen limits"
+msgstr "允许窗口完全位于屏幕可见范围外"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:254
+msgid "Screen Limits"
+msgstr "屏幕范围"
+
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:64
 #: src/modules/conf_window_manipulation/e_mod_main.c:20
 msgid "Window Geometry"
@@ -7787,10 +9825,6 @@ msgstr "键盘"
 msgid "Limit resize to useful geometry"
 msgstr "可更改的最小尺寸"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:263
-msgid "Ensure initial placement of windows inside useful geometry"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:266
 msgid "Adjust windows on shelf hide"
 msgstr "书架隐藏时调整窗口"
@@ -7838,10 +9872,6 @@ msgstr "窗口进程管理"
 msgid "Kill process if unclosable"
 msgstr "如果无法关闭则杀死进程"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_process.c:97
-msgid "Kill process instead of client"
-msgstr "杀死进程而不是客户端"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_process.c:99
 msgid "Kill timeout:"
 msgstr "杀死超时："
@@ -7919,10 +9949,29 @@ msgstr "窗口记忆"
 msgid "Window remember settings"
 msgstr "窗口记忆"
 
-#: src/modules/conf_window_remembers/e_mod_main.c:28
-#, fuzzy
-msgid "remember"
-msgstr "记住"
+#: src/modules/connman/e_mod_main.c:10
+msgid "Connection Manager"
+msgstr "连接管理器"
+
+#: src/modules/connman/e_mod_main.c:189
+msgid "Missing Application"
+msgstr "遗失的应用程序"
+
+#: src/modules/connman/e_mod_main.c:190
+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:273
+msgid "Wifi On"
+msgstr "Wifi 开启"
+
+#: src/modules/connman/e_mod_main.c:281
+#: src/modules/everything/evry_config.c:379
+msgid "Configure"
+msgstr "配置"
 
 #: src/modules/cpufreq/e_mod_main.c:136
 msgid "Cpufreq"
@@ -8061,12 +10110,6 @@ msgstr "显示所有启动器"
 msgid "Everything Configuration"
 msgstr "配置任务中心"
 
-#: src/modules/everything/e_mod_main.c:70 src/modules/fileman/e_mod_main.c:448
-#: src/modules/quickaccess/e_mod_main.c:68
-#, fuzzy
-msgid "settings"
-msgstr "设置"
-
 #: src/modules/everything/e_mod_main.c:70
 #, fuzzy
 msgid "Everything launcher settings"
@@ -8104,11 +10147,6 @@ msgstr "上移"
 msgid "Move Down"
 msgstr "下移"
 
-#: src/modules/everything/evry_config.c:379
-#: src/modules/connman/e_mod_main.c:281
-msgid "Configure"
-msgstr "配置"
-
 #: src/modules/everything/evry_config.c:385
 msgid "Enabled"
 msgstr "已启用"
@@ -8162,6 +10200,10 @@ msgstr "隐藏列表"
 msgid "Quick Navigation"
 msgstr "快速访问"
 
+#: src/modules/everything/evry_config.c:495
+msgid "Off"
+msgstr "关"
+
 #: src/modules/everything/evry_config.c:497
 msgid "Emacs style (ALT + n,p,f,b,m,i)"
 msgstr "Emacs 样式 (ALT + n,p,f,b,m,i)"
@@ -8239,11 +10281,11 @@ msgstr "任务中心集合"
 msgid "Everything Starter"
 msgstr "任务中心启动器"
 
-#: src/modules/everything/evry_gadget.c:587
+#: src/modules/everything/evry_gadget.c:566
 msgid "Everything Gadgets"
 msgstr "任务中心组件"
 
-#: src/modules/everything/evry_gadget.c:685
+#: src/modules/everything/evry_gadget.c:664
 msgid "Plugin"
 msgstr "插件"
 
@@ -8756,24 +10798,6 @@ msgstr "提示"
 msgid "File Manager"
 msgstr "文件管理器"
 
-#: src/modules/fileman/e_mod_main.c:51 src/modules/fileman/e_mod_main.c:52
-#: src/modules/fileman/e_mod_main.c:161 src/modules/fileman/e_mod_main.c:162
-#: src/modules/fileman/e_mod_main.c:163 src/modules/fileman/e_mod_main.c:389
-#: src/modules/fileman/e_mod_main.c:393 src/modules/fileman/e_mod_main.c:397
-#: src/modules/fileman/e_mod_main.c:399 src/modules/fileman/e_mod_main.c:401
-#: src/modules/fileman/e_mod_main.c:403 src/modules/fileman/e_mod_main.c:407
-#: src/modules/fileman/e_mod_main.c:410 src/modules/fileman/e_mod_main.c:412
-#: src/modules/fileman/e_mod_main.c:414 src/modules/fileman/e_mod_main.c:416
-#: src/modules/fileman/e_mod_main.c:420 src/modules/fileman/e_mod_main.c:422
-#: src/modules/fileman/e_mod_main.c:426 src/modules/fileman/e_mod_main.c:428
-#: src/modules/fileman/e_mod_main.c:430 src/modules/fileman/e_mod_main.c:432
-#: src/modules/fileman/e_mod_main.c:438 src/modules/fileman/e_mod_main.c:442
-#: src/modules/fileman/e_mod_main.c:448 src/modules/fileman/e_mod_main.c:452
-#: src/modules/fileman/e_mod_main.c:453
-#, fuzzy
-msgid "files"
-msgstr "文件"
-
 #: src/modules/fileman/e_mod_main.c:65
 msgid "Navigate"
 msgstr "导航"
@@ -8803,12 +10827,6 @@ msgstr "默认查看器"
 msgid "Icon size"
 msgstr "图标尺寸"
 
-#: src/modules/fileman/e_mod_main.c:393 src/modules/fileman/e_mod_main.c:438
-#: src/modules/fileman/e_mod_main.c:448
-#, fuzzy
-msgid "image"
-msgstr "图片"
-
 #: src/modules/fileman/e_mod_main.c:397
 #, fuzzy
 msgid "Show file extensions"
@@ -8897,12 +10915,6 @@ msgstr ""
 msgid "Spring folder delay"
 msgstr "挂起延迟"
 
-#: src/modules/fileman/e_mod_main.c:442
-#: src/modules/notification/e_mod_main.c:242
-#: src/modules/notification/e_mod_main.c:243
-msgid "delay"
-msgstr ""
-
 #: src/modules/fileman/e_mod_main.c:443
 msgid ""
 "A \"spring folder\" is the action that occurs when dragging a file onto a "
@@ -9024,163 +11036,6 @@ msgstr "显示/隐藏组件"
 msgid "Change Gadgets"
 msgstr "更改组件"
 
-#: src/modules/winlist/e_int_config_winlist.c:52
-msgid "Window Switcher Settings"
-msgstr "窗口切换设置"
-
-#: src/modules/winlist/e_int_config_winlist.c:181
-msgid "Windows from other desks"
-msgstr "来自其他桌面的窗口"
-
-#: src/modules/winlist/e_int_config_winlist.c:184
-msgid "Windows from other screens"
-msgstr "来自其他屏幕的窗口"
-
-#: src/modules/winlist/e_int_config_winlist.c:187
-msgid "Iconified"
-msgstr "图标化"
-
-#: src/modules/winlist/e_int_config_winlist.c:189
-msgid "Iconified from other desks"
-msgstr "来自其他桌面图标化程序"
-
-#: src/modules/winlist/e_int_config_winlist.c:193
-msgid "Iconified from other screens"
-msgstr "来自其他屏幕图标化程序"
-
-#: src/modules/winlist/e_int_config_winlist.c:205
-msgid "Uniconify/Unshade"
-msgstr ""
-
-#: src/modules/winlist/e_int_config_winlist.c:207
-msgid "Warp mouse while selecting"
-msgstr "选择时鼠标可以回绕"
-
-#: src/modules/winlist/e_int_config_winlist.c:211
-msgid "Warp mouse at end"
-msgstr "从尾部回绕"
-
-#: src/modules/winlist/e_int_config_winlist.c:215
-msgid "Disable mouse warp on directional focus change"
-msgstr ""
-
-#: src/modules/winlist/e_int_config_winlist.c:219
-msgid "Jump to desk"
-msgstr "跳转到桌面"
-
-#: src/modules/winlist/e_int_config_winlist.c:221
-msgid "Selecting"
-msgstr "选择"
-
-#: src/modules/winlist/e_int_config_winlist.c:225
-msgid "Scroll Animation"
-msgstr "滚动动画"
-
-#: src/modules/winlist/e_int_config_winlist.c:228
-msgid "Scroll speed"
-msgstr "滚屏速度"
-
-#: src/modules/winlist/e_int_config_winlist.c:239
-msgid "Minimum width"
-msgstr "最小宽度"
-
-#: src/modules/winlist/e_int_config_winlist.c:241
-#: src/modules/winlist/e_int_config_winlist.c:248
-#: src/modules/winlist/e_int_config_winlist.c:254
-#: src/modules/winlist/e_int_config_winlist.c:261
-#, c-format
-msgid "%4.0f"
-msgstr "%4.0f"
-
-#: src/modules/winlist/e_int_config_winlist.c:246
-msgid "Maximum width"
-msgstr "最大宽度"
-
-#: src/modules/winlist/e_int_config_winlist.c:252
-msgid "Minimum height"
-msgstr "最小高度"
-
-#: src/modules/winlist/e_int_config_winlist.c:259
-msgid "Maximum height"
-msgstr "最大高度"
-
-#: src/modules/winlist/e_int_config_winlist.c:269
-msgid "Horizontal alignment"
-msgstr "水平排列"
-
-#: src/modules/winlist/e_int_config_winlist.c:274
-msgid "Vertical alignment"
-msgstr "垂直排列"
-
-#: src/modules/winlist/e_int_config_winlist.c:279
-msgid "Alignment"
-msgstr "对齐"
-
-#: src/modules/winlist/e_mod_main.c:28
-msgid "Window Switcher"
-msgstr "窗口切换"
-
-#: src/modules/winlist/e_mod_main.c:41
-msgid "Next Window"
-msgstr "下一窗口"
-
-#: src/modules/winlist/e_mod_main.c:43
-msgid "Previous Window"
-msgstr "前一窗口"
-
-#: src/modules/winlist/e_mod_main.c:46
-msgid "Next window of same class"
-msgstr "同一类的下一窗口"
-
-#: src/modules/winlist/e_mod_main.c:49
-msgid "Previous window of same class"
-msgstr "同一类的上一窗口"
-
-#: src/modules/winlist/e_mod_main.c:52
-msgid "Next window class"
-msgstr "下一窗口类"
-
-#: src/modules/winlist/e_mod_main.c:55
-msgid "Previous window class"
-msgstr "上一窗口类"
-
-#: src/modules/winlist/e_mod_main.c:57
-msgid "Window on the Left"
-msgstr "左边的窗口"
-
-#: src/modules/winlist/e_mod_main.c:59
-msgid "Window Down"
-msgstr "下移窗口"
-
-#: src/modules/winlist/e_mod_main.c:61
-msgid "Window Up"
-msgstr "上移窗口"
-
-#: src/modules/winlist/e_mod_main.c:63
-msgid "Window on the Right"
-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
-msgid "Winlist Error"
-msgstr "Winlist 错误"
-
-#: src/modules/winlist/e_mod_main.c:209
-msgid "Winlist cannot be activated from an edge binding"
-msgstr ""
-
-#: src/modules/winlist/e_mod_main.c:215
-msgid "Winlist cannot be activated from a signal binding"
-msgstr ""
-
-#: src/modules/winlist/e_mod_main.c:221
-msgid "Winlist cannot be activated from an ACPI binding"
-msgstr ""
-
-#: src/modules/winlist/e_winlist.c:157
-msgid "Select a window"
-msgstr "选择一个窗口"
-
 #: src/modules/ibar/e_mod_config.c:54
 msgid "IBar Settings"
 msgstr "IBar 设定"
@@ -9301,6 +11156,323 @@ msgstr "在活动桌面显示窗口"
 msgid "IBox"
 msgstr "IBox"
 
+#: src/modules/mixer/app_mixer.c:175 src/modules/mixer/app_mixer.c:282
+msgid "Boost"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:177 src/modules/mixer/app_mixer.c:284
+msgid "Playback"
+msgstr "回放"
+
+#: src/modules/mixer/app_mixer.c:179 src/modules/mixer/app_mixer.c:286
+msgid "Capture"
+msgstr "捕捉"
+
+#: src/modules/mixer/app_mixer.c:181 src/modules/mixer/app_mixer.c:288
+msgid "Switch"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:350
+msgid "Cards"
+msgstr "声卡"
+
+#: src/modules/mixer/app_mixer.c:363 src/modules/mixer/conf_gadget.c:279
+msgid "Channels"
+msgstr "声道"
+
+#: src/modules/mixer/app_mixer.c:373
+msgid "Card:"
+msgstr "声卡："
+
+#: src/modules/mixer/app_mixer.c:377
+msgid "Channel:"
+msgstr "声道："
+
+#: src/modules/mixer/app_mixer.c:385
+msgid "Left:"
+msgstr "左："
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Right:"
+msgstr "右："
+
+#: src/modules/mixer/app_mixer.c:395 src/modules/mixer/e_mod_main.c:569
+msgid "Mute"
+msgstr "静音"
+
+#: src/modules/mixer/app_mixer.c:398 src/modules/mixer/conf_gadget.c:195
+msgid "Lock Sliders"
+msgstr "锁定滚动条"
+
+#: src/modules/mixer/conf_gadget.c:201
+msgid "Show both sliders when locked"
+msgstr "锁定后显示滚动条"
+
+#: src/modules/mixer/conf_gadget.c:206
+msgid "Show Popup on volume change via keybindings"
+msgstr "使用快捷键调整音量时显示弹出菜单"
+
+#: src/modules/mixer/conf_gadget.c:317
+msgid "Sound Cards"
+msgstr "声卡"
+
+#: src/modules/mixer/conf_gadget.c:379
+msgid "Mixer Settings"
+msgstr "混音器设置"
+
+#: src/modules/mixer/conf_module.c:93
+msgid "Mixer to use for global actions:"
+msgstr "全局作用的混音器："
+
+#: src/modules/mixer/conf_module.c:117
+msgid "Display desktop notifications on volume change"
+msgstr "音量更改时显示桌面通知"
+
+#: src/modules/mixer/conf_module.c:153
+msgid "Launch mixer..."
+msgstr "启动混音器..."
+
+#: src/modules/mixer/conf_module.c:188
+msgid "Mixer Module Settings"
+msgstr "混音器模块设定"
+
+#: src/modules/mixer/e_mod_main.c:11 src/modules/mixer/e_mod_main.c:55
+msgid "Mixer"
+msgstr "混音器"
+
+#: src/modules/mixer/e_mod_main.c:42
+msgid "New volume"
+msgstr "新的音量"
+
+#: src/modules/mixer/e_mod_main.c:58
+msgid "Volume changed"
+msgstr "音量改变"
+
+#: src/modules/mixer/e_mod_main.c:177
+msgid "Mixer Settings Updated"
+msgstr "混音器设定已经更新"
+
+#: src/modules/mixer/e_mod_main.c:1246
+msgid "Mixer Module"
+msgstr "混音器模块"
+
+#: src/modules/mixer/e_mod_main.c:1274
+msgid "Increase Volume"
+msgstr "提高音量"
+
+#: src/modules/mixer/e_mod_main.c:1275
+msgid "Decrease Volume"
+msgstr "降低音量"
+
+#: src/modules/mixer/e_mod_main.c:1276
+msgid "Mute Volume"
+msgstr "静音"
+
+#: src/modules/music-control/e_mod_main.c:9
+#, fuzzy
+msgid "Music controller"
+msgstr "Syscon 设置"
+
+#: src/modules/music-control/ui.c:111
+msgid "Music Player"
+msgstr ""
+
+#: src/modules/music-control/ui.c:121
+msgid "* Your player must be configured to export the DBus interface MPRIS2."
+msgstr ""
+
+#: src/modules/music-control/ui.c:124
+msgid "Pause music when screen is locked"
+msgstr ""
+
+#: src/modules/music-control/ui.c:195
+#, fuzzy
+msgid "Music control Settings"
+msgstr "Syscon 设置"
+
+#: src/modules/notification/e_mod_config.c:51
+msgid "Notification Settings"
+msgstr "通知设置"
+
+#: src/modules/notification/e_mod_config.c:99
+msgid "Urgency"
+msgstr "紧急程度"
+
+#: src/modules/notification/e_mod_config.c:100
+msgid "Levels of urgency to display:"
+msgstr "显示紧急级别:"
+
+#: src/modules/notification/e_mod_config.c:106
+msgid "Critical"
+msgstr "严重"
+
+#: src/modules/notification/e_mod_config.c:110
+msgid "Default Timeout"
+msgstr "默认延时"
+
+#: src/modules/notification/e_mod_config.c:111
+msgid "Force timeout for all notifications"
+msgstr ""
+
+#: src/modules/notification/e_mod_config.c:130
+#, fuzzy
+msgid "Screen Policy"
+msgstr "屏幕锁定"
+
+#: src/modules/notification/e_mod_config.c:132
+#, fuzzy
+msgid "Primary screen"
+msgstr "屏幕"
+
+#: src/modules/notification/e_mod_config.c:134
+#, fuzzy
+msgid "Current screen"
+msgstr "当前屏幕"
+
+#: src/modules/notification/e_mod_config.c:136
+#, fuzzy
+msgid "All screens"
+msgstr "全屏"
+
+#: src/modules/notification/e_mod_config.c:138
+msgid "Xinerama"
+msgstr ""
+
+#: src/modules/notification/e_mod_config.c:142
+msgid "Popup Corner"
+msgstr "弹出角"
+
+#: src/modules/notification/e_mod_config.c:144
+msgid "Top left"
+msgstr "左上"
+
+#: src/modules/notification/e_mod_config.c:146
+msgid "Top right"
+msgstr "右上"
+
+#: src/modules/notification/e_mod_config.c:148
+msgid "Bottom left"
+msgstr "左下"
+
+#: src/modules/notification/e_mod_config.c:150
+msgid "Bottom right"
+msgstr "右下"
+
+#: src/modules/notification/e_mod_config.c:162
+msgid "Ignore replace ID"
+msgstr ""
+
+#: src/modules/notification/e_mod_main.c:49
+msgid "Enter Presentation Mode"
+msgstr "进入演示模式"
+
+#: src/modules/notification/e_mod_main.c:50
+msgid ""
+"Enlightenment is in <b>presentation</b> mode.<br>During presentation mode, "
+"screen saver, lock and power saving will be disabled so you are not "
+"interrupted."
+msgstr ""
+"Enlightenment 处于<b>演示</b>模式。<br>在“演示”模式，屏幕保护，时钟和省电功能"
+"将被禁用，所以不会被中断。"
+
+#: src/modules/notification/e_mod_main.c:56
+msgid "Exited Presentation Mode"
+msgstr "离开演示模式"
+
+#: src/modules/notification/e_mod_main.c:57
+msgid ""
+"Presentation mode is over.<br>Now screen saver, lock and power saving "
+"settings will be restored."
+msgstr "演示模式结束。<br>现在屏幕保护，时钟和省电功能恢复正常。"
+
+#: src/modules/notification/e_mod_main.c:72
+msgid "Enter Offline Mode"
+msgstr "进入脱机模式"
+
+#: src/modules/notification/e_mod_main.c:73
+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>在脱机模式下，使用网络的模块将不会查询"
+"远程服务。。"
+
+#: src/modules/notification/e_mod_main.c:79
+msgid "Exited Offline Mode"
+msgstr "成功离开脱机模式"
+
+#: src/modules/notification/e_mod_main.c:80
+msgid ""
+"Now in <b>online</b> mode.<br>Now modules that use network will resume "
+"regular tasks."
+msgstr "现在处于<b>在线</b>模式。<br>从现在起程序恢复与网络的接连。"
+
+#: src/modules/notification/e_mod_main.c:201
+msgid "Notification"
+msgstr "通知"
+
+#: src/modules/notification/e_mod_main.c:222
+msgid "Notification Module"
+msgstr "通知模块"
+
+#: src/modules/notification/e_mod_main.c:243
+msgid "Error during notification server initialization"
+msgstr ""
+
+#: src/modules/notification/e_mod_main.c:244
+#, fuzzy
+msgid ""
+"Ensure there's no other module acting as a server and that D-Bus is "
+"correctly installed and  running"
+msgstr "DBus 初始化出错！请检查 dbug 是否已经安装正确并已运行。"
+
+#: src/modules/notification/e_mod_main.c:261
+#, fuzzy
+msgid "Display low urgency notifications"
+msgstr "显示边界标题"
+
+#: src/modules/notification/e_mod_main.c:261
+#: src/modules/notification/e_mod_main.c:262
+#: src/modules/notification/e_mod_main.c:263
+#: src/modules/notification/e_mod_main.c:264
+#: src/modules/notification/e_mod_main.c:265
+#: src/modules/notification/e_mod_main.c:267
+#: src/modules/notification/e_mod_main.c:270
+#: src/modules/notification/e_mod_main.c:274
+#: src/modules/notification/e_mod_main.c:275
+#: src/modules/notification/e_mod_main.c:276
+#: src/modules/notification/e_mod_main.c:299
+#: src/modules/notification/e_mod_main.c:300
+#, fuzzy
+msgid "notification"
+msgstr "通知"
+
+#: src/modules/notification/e_mod_main.c:262
+#, fuzzy
+msgid "Display normal urgency notifications"
+msgstr "显示信息"
+
+#: src/modules/notification/e_mod_main.c:263
+#, fuzzy
+msgid "Display high urgency notifications"
+msgstr "显示信息"
+
+#: src/modules/notification/e_mod_main.c:264
+msgid "Force a specified timeout on all notifications"
+msgstr ""
+
+#: src/modules/notification/e_mod_main.c:265
+msgid "Timeout to force on notifications"
+msgstr ""
+
+#: src/modules/notification/e_mod_main.c:267
+msgid "Screen(s) on which to display notifications"
+msgstr ""
+
+#: src/modules/notification/e_mod_main.c:270
+msgid "Corner in which to display notifications"
+msgstr ""
+
 #: src/modules/pager/e_mod_config.c:76
 msgid "Pager Settings"
 msgstr "分页器设定"
@@ -9406,31 +11578,31 @@ msgstr ""
 "您不能在书架上使用鼠标右键，<br>因为右键已经被指定到上下文菜单。<br>此按键只"
 "能在弹出菜单工作。"
 
-#: src/modules/pager/e_mod_main.c:2929
+#: src/modules/pager/e_mod_main.c:2931
 msgid "Show Pager Popup"
 msgstr "显示分页器弹出窗口"
 
-#: src/modules/pager/e_mod_main.c:2936
+#: src/modules/pager/e_mod_main.c:2938
 msgid "Popup Desk Right"
 msgstr "弹出桌面向右"
 
-#: src/modules/pager/e_mod_main.c:2938
+#: src/modules/pager/e_mod_main.c:2940
 msgid "Popup Desk Left"
 msgstr "弹出桌面向左"
 
-#: src/modules/pager/e_mod_main.c:2940
+#: src/modules/pager/e_mod_main.c:2942
 msgid "Popup Desk Up"
 msgstr "弹出桌面向上"
 
-#: src/modules/pager/e_mod_main.c:2942
+#: src/modules/pager/e_mod_main.c:2944
 msgid "Popup Desk Down"
 msgstr "弹出桌面向下"
 
-#: src/modules/pager/e_mod_main.c:2944
+#: src/modules/pager/e_mod_main.c:2946
 msgid "Popup Desk Next"
 msgstr "弹出桌面向下一个"
 
-#: src/modules/pager/e_mod_main.c:2946
+#: src/modules/pager/e_mod_main.c:2948
 msgid "Popup Desk Previous"
 msgstr "弹出桌面向上一个"
 
@@ -9509,360 +11681,6 @@ msgstr "Physics 错误"
 msgid "The physics module could not be started"
 msgstr "Physics 模块无法启动"
 
-#: src/modules/syscon/e_int_config_syscon.c:43
-msgid "Syscon Settings"
-msgstr "Syscon 设置"
-
-#: src/modules/syscon/e_int_config_syscon.c:151
-msgid "Secondary"
-msgstr "次要"
-
-#: src/modules/syscon/e_int_config_syscon.c:156
-msgid "Extra"
-msgstr "额外"
-
-#: src/modules/syscon/e_int_config_syscon.c:161
-msgid "Icon Sizes"
-msgstr "图标尺寸"
-
-#: src/modules/syscon/e_int_config_syscon.c:165
-msgid "Do default action after timeout"
-msgstr "超时后做默认动作"
-
-#: src/modules/syscon/e_int_config_syscon.c:172
-msgid "Default Action"
-msgstr "默认动作"
-
-#: src/modules/syscon/e_mod_main.c:31
-msgid "System Controls"
-msgstr "系统控制"
-
-#: src/modules/syscon/e_mod_main.c:37
-msgid "Syscon"
-msgstr "Syscon"
-
-#: src/modules/temperature/e_mod_config.c:56
-msgid "Temperature Settings"
-msgstr "温度设定"
-
-#: src/modules/temperature/e_mod_config.c:217
-msgid "Sensors"
-msgstr "传感器"
-
-#: src/modules/temperature/e_mod_config.c:223
-msgid "Celsius"
-msgstr "摄氏"
-
-#: src/modules/temperature/e_mod_config.c:226
-msgid "Fahrenheit"
-msgstr "华氏"
-
-#: src/modules/temperature/e_mod_config.c:229
-msgid "Display Units"
-msgstr "显示单位"
-
-#: src/modules/temperature/e_mod_config.c:236
-msgid "Check Interval"
-msgstr "检查间隔"
-
-#: src/modules/temperature/e_mod_config.c:240
-msgid "High Temperature"
-msgstr "高温"
-
-#: src/modules/temperature/e_mod_config.c:244
-#: src/modules/temperature/e_mod_config.c:256
-#: src/modules/temperature/e_mod_config.c:314
-#: src/modules/temperature/e_mod_config.c:315
-#, c-format
-msgid "%1.0f F"
-msgstr "%1.0f F"
-
-#: src/modules/temperature/e_mod_config.c:248
-#: src/modules/temperature/e_mod_config.c:260
-#: src/modules/temperature/e_mod_config.c:325
-#: src/modules/temperature/e_mod_config.c:326
-#, c-format
-msgid "%1.0f C"
-msgstr "%1.0f C"
-
-#: src/modules/temperature/e_mod_config.c:252
-msgid "Low Temperature"
-msgstr "低温"
-
-#: src/modules/temperature/e_mod_config.c:264
-msgid "Temperatures"
-msgstr "温度"
-
-#: src/modules/temperature/e_mod_main.c:173
-msgid "Temperature"
-msgstr "温度"
-
-#: src/modules/wizard/e_wizard.c:233 src/modules/wizard/e_wizard.c:262
-msgid "Next"
-msgstr "下一步"
-
-#: src/modules/wizard/e_wizard.c:267
-msgid "Please Wait..."
-msgstr "请稍候..."
-
-#: src/modules/wizard/e_wizard.c:283
-msgid "Welcome to Enlightenment"
-msgstr "欢迎光临Enlightenment"
-
-#: src/modules/wizard/page_010.c:161 src/modules/wizard/page_011.c:147
-#: src/modules/wizard/page_020.c:52
-msgid "Select one"
-msgstr "选择一个"
-
-#: src/modules/wizard/page_020.c:51
-msgid "Profile"
-msgstr "配置文件"
-
-#: src/modules/wizard/page_040.c:36
-msgid "Adding missing App files"
-msgstr "添加缺失的应用程序文件"
-
-#: src/modules/wizard/page_050.c:130
-msgid "Select preferred size"
-msgstr "选择首选大小"
-
-#: src/modules/wizard/page_060.c:29
-msgid "Focus by ..."
-msgstr "聚焦方式..."
-
-#: src/modules/wizard/page_060.c:36
-msgid "Mouse Over"
-msgstr "鼠标悬停"
-
-#: src/modules/wizard/page_110.c:13
-msgid "Network Management"
-msgstr "网络管理"
-
-#: src/modules/wizard/page_110.c:17
-msgid "Connman network service not found"
-msgstr "未发现 Connman 网络服务"
-
-#: src/modules/wizard/page_110.c:20
-msgid "Install Connman for network management support"
-msgstr "为网络管理支持安装 Connman"
-
-#: src/modules/wizard/page_110.c:23
-msgid "Connman support disabled"
-msgstr "Connman 支持已禁用"
-
-#: src/modules/wizard/page_110.c:26
-msgid "Install/Enable Connman for network management support"
-msgstr "为网络管理支持安装或启用 Connman"
-
-#: src/modules/wizard/page_110.c:162
-msgid "Checking to see if Connman exists"
-msgstr "正在检查 Connman 是否存在"
-
-#: src/modules/wizard/page_150.c:61
-msgid "Compositing"
-msgstr "混成"
-
-#: src/modules/wizard/page_150.c:85
-msgid "Hardware Accelerated (OpenGL)"
-msgstr "硬件加速(OpenGL)"
-
-#: src/modules/wizard/page_150.c:88
-msgid "Tear-free Rendering (OpenGL only)"
-msgstr "Tear-free 渲染(仅 OpenGL)"
-
-#: src/modules/wizard/page_170.c:24
-msgid "Updates"
-msgstr "更新"
-
-#: src/modules/wizard/page_170.c:26
-msgid "Check for available updates"
-msgstr "检查可用更新"
-
-#: src/modules/wizard/page_170.c:32
-#, fuzzy
-msgid ""
-"Enlightenment can check for new<br>versions, updates, security "
-"and<br>bugfixes, as well as available add-ons.<br><br>This is very useful, "
-"because it lets<br>you know about available bug fixes and<br>security fixes "
-"when they happen. As a<br>result, Enlightenment will connect "
-"to<br>enlightenment.org and transmit some<br>information, much like any web "
-"browser<br>might do. No personal information such as<br>username, password "
-"or any personal files<br>will be transmitted. If you don't like this,"
-"<br>please disable this below. It is highly<br>advised that you do 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"
-msgstr "启用更新检查"
-
-#: src/modules/wizard/page_180.c:26
-msgid "Information"
-msgstr "信息"
-
-#: src/modules/wizard/page_180.c:32
-msgid "A taskbar can be added to<br>show open windows and applications."
-msgstr "可以添加任务栏以显示打开的窗口和应用程序。"
-
-#: src/modules/wizard/page_180.c:38
-msgid "Enable Taskbar"
-msgstr "启用任务栏"
-
-#: src/modules/mixer/app_mixer.c:175 src/modules/mixer/app_mixer.c:282
-msgid "Boost"
-msgstr ""
-
-#: src/modules/mixer/app_mixer.c:177 src/modules/mixer/app_mixer.c:284
-msgid "Playback"
-msgstr "回放"
-
-#: src/modules/mixer/app_mixer.c:179 src/modules/mixer/app_mixer.c:286
-msgid "Capture"
-msgstr "捕捉"
-
-#: src/modules/mixer/app_mixer.c:181 src/modules/mixer/app_mixer.c:288
-msgid "Switch"
-msgstr ""
-
-#: src/modules/mixer/app_mixer.c:350
-msgid "Cards"
-msgstr "声卡"
-
-#: src/modules/mixer/app_mixer.c:363 src/modules/mixer/conf_gadget.c:279
-msgid "Channels"
-msgstr "声道"
-
-#: src/modules/mixer/app_mixer.c:373
-msgid "Card:"
-msgstr "声卡："
-
-#: src/modules/mixer/app_mixer.c:377
-msgid "Channel:"
-msgstr "声道："
-
-#: src/modules/mixer/app_mixer.c:385
-msgid "Left:"
-msgstr "左："
-
-#: src/modules/mixer/app_mixer.c:390
-msgid "Right:"
-msgstr "右："
-
-#: src/modules/mixer/app_mixer.c:395 src/modules/mixer/e_mod_main.c:642
-msgid "Mute"
-msgstr "静音"
-
-#: src/modules/mixer/app_mixer.c:398 src/modules/mixer/conf_gadget.c:195
-msgid "Lock Sliders"
-msgstr "锁定滚动条"
-
-#: src/modules/mixer/conf_gadget.c:201
-msgid "Show both sliders when locked"
-msgstr "锁定后显示滚动条"
-
-#: src/modules/mixer/conf_gadget.c:206
-msgid "Show Popup on volume change via keybindings"
-msgstr "使用快捷键调整音量时显示弹出菜单"
-
-#: src/modules/mixer/conf_gadget.c:317
-msgid "Sound Cards"
-msgstr "声卡"
-
-#: src/modules/mixer/conf_gadget.c:379
-msgid "Mixer Settings"
-msgstr "混音器设置"
-
-#: src/modules/mixer/conf_module.c:93
-msgid "Mixer to use for global actions:"
-msgstr "全局作用的混音器："
-
-#: src/modules/mixer/conf_module.c:117
-msgid "Display desktop notifications on volume change"
-msgstr "音量更改时显示桌面通知"
-
-#: src/modules/mixer/conf_module.c:153
-msgid "Launch mixer..."
-msgstr "启动混音器..."
-
-#: src/modules/mixer/conf_module.c:188
-msgid "Mixer Module Settings"
-msgstr "混音器模块设定"
-
-#: src/modules/mixer/e_mod_main.c:11 src/modules/mixer/e_mod_main.c:55
-msgid "Mixer"
-msgstr "混音器"
-
-#: src/modules/mixer/e_mod_main.c:42
-msgid "New volume"
-msgstr "新的音量"
-
-#: src/modules/mixer/e_mod_main.c:58
-msgid "Volume changed"
-msgstr "音量改变"
-
-#: src/modules/mixer/e_mod_main.c:177
-msgid "Mixer Settings Updated"
-msgstr "混音器设定已经更新"
-
-#: src/modules/mixer/e_mod_main.c:1325
-msgid "Mixer Module"
-msgstr "混音器模块"
-
-#: src/modules/mixer/e_mod_main.c:1353
-msgid "Increase Volume"
-msgstr "提高音量"
-
-#: src/modules/mixer/e_mod_main.c:1354
-msgid "Decrease Volume"
-msgstr "降低音量"
-
-#: src/modules/mixer/e_mod_main.c:1355
-msgid "Mute Volume"
-msgstr "静音"
-
-#: src/modules/music-control/ui.c:111
-msgid "Music Player"
-msgstr ""
-
-#: src/modules/music-control/ui.c:121
-msgid "* Your player must be configured to export the DBus interface MPRIS2."
-msgstr ""
-
-#: src/modules/music-control/ui.c:124
-msgid "Pause music when screen is locked"
-msgstr ""
-
-#: src/modules/music-control/ui.c:195
-#, fuzzy
-msgid "Music control Settings"
-msgstr "Syscon 设置"
-
-#: src/modules/connman/e_mod_main.c:10
-msgid "Connection Manager"
-msgstr "连接管理器"
-
-#: src/modules/connman/e_mod_main.c:189
-msgid "Missing Application"
-msgstr "遗失的应用程序"
-
-#: src/modules/connman/e_mod_main.c:190
-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:273
-msgid "Wifi On"
-msgstr "Wifi 开启"
-
 #: src/modules/quickaccess/e_mod_config.c:226
 msgid "Enter a unique name for this entry"
 msgstr "为新条目起一个名字："
@@ -9933,11 +11751,6 @@ msgstr ""
 msgid "Hide windows when focus is lost"
 msgstr "当鼠标移动到窗口时提升窗口"
 
-#: src/modules/quickaccess/e_mod_main.c:74
-#, fuzzy
-msgid "focus"
-msgstr "焦点"
-
 #: src/modules/quickaccess/e_mod_main.c:75
 msgid ""
 "This option causes Quickaccess windows to automatically hide when they lose "
@@ -9962,13 +11775,6 @@ msgstr "跳过分页器"
 msgid "This option causes Quickaccess windows to not show up in pagers"
 msgstr ""
 
-#: src/modules/quickaccess/e_mod_main.c:81
-#: src/modules/quickaccess/e_mod_main.c:102
-#: src/modules/tiling/e_mod_tiling.c:3923
-#, fuzzy
-msgid "windows"
-msgstr "窗口"
-
 #: src/modules/quickaccess/e_mod_quickaccess.c:8
 msgid "Toggle Visibility"
 msgstr "切换可见性"
@@ -10173,30 +11979,6 @@ msgstr ""
 msgid "quick access name/identifier"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:255
-msgid "Another systray exists"
-msgstr "有另一个系统托盘存在"
-
-#: src/modules/systray/e_mod_main.c:256
-msgid "There can be only one systray gadget and another one already exists."
-msgstr "只允许一个系统托盘的组件，目前已经有了一个。"
-
-#: src/modules/systray/e_mod_main.c:264 src/modules/systray/e_mod_xembed.c:395
-msgid "Systray Error"
-msgstr "系统托盘出错"
-
-#: src/modules/systray/e_mod_main.c:265
-msgid "Systray cannot work in a shelf that is set to below everything."
-msgstr ""
-
-#: src/modules/systray/e_mod_main.c:417
-msgid "Systray"
-msgstr "系统托盘"
-
-#: src/modules/systray/e_mod_xembed.c:396
-msgid "Systray cannot set its background invisible to match its shelf."
-msgstr ""
-
 #: src/modules/shot/e_mod_main.c:175 src/modules/shot/e_mod_main.c:209
 msgid "Error saving screenshot file"
 msgstr "保存截图文件出错"
@@ -10220,7 +12002,7 @@ msgstr "文件没有扩展名。<br>请使用 .jpg 或 .png，<br>其他格式�
 msgid "Select screenshot save location"
 msgstr "选择截图保存位置"
 
-#: src/modules/shot/e_mod_main.c:288 src/modules/shot/e_mod_main.c:798
+#: src/modules/shot/e_mod_main.c:288 src/modules/shot/e_mod_main.c:795
 msgid "Save"
 msgstr "保存"
 
@@ -10308,46 +12090,94 @@ msgid ""
 "visible."
 msgstr "这张图片将被上传至<br>enlightenment.org，对所有人可见。"
 
-#: src/modules/shot/e_mod_main.c:567
-msgid "Confirm"
-msgstr "确定"
-
-#: src/modules/shot/e_mod_main.c:667
+#: src/modules/shot/e_mod_main.c:664
 msgid "Where to put Screenshot..."
 msgstr "截图放置的地方..."
 
-#: src/modules/shot/e_mod_main.c:719
+#: src/modules/shot/e_mod_main.c:716
 msgid "Quality"
 msgstr "质量"
 
-#: src/modules/shot/e_mod_main.c:723
+#: src/modules/shot/e_mod_main.c:720
 msgid "Perfect"
 msgstr "完美"
 
-#: src/modules/shot/e_mod_main.c:800
+#: src/modules/shot/e_mod_main.c:797
 msgid "Share"
 msgstr "共享"
 
-#: src/modules/shot/e_mod_main.c:937 src/modules/shot/e_mod_main.c:984
+#: src/modules/shot/e_mod_main.c:934 src/modules/shot/e_mod_main.c:981
 msgid "Take Shot"
 msgstr "屏幕截图"
 
-#: src/modules/shot/e_mod_main.c:948 src/modules/shot/e_mod_main.c:977
-#: src/modules/shot/e_mod_main.c:988
+#: src/modules/shot/e_mod_main.c:945 src/modules/shot/e_mod_main.c:974
+#: src/modules/shot/e_mod_main.c:985
 msgid "Take Screenshot"
 msgstr "屏幕截图"
 
-#: src/modules/shot/e_mod_main.c:965
+#: src/modules/shot/e_mod_main.c:962
 msgid "Shot Error"
 msgstr "截图出错"
 
-#: src/modules/shot/e_mod_main.c:966
+#: src/modules/shot/e_mod_main.c:963
 msgid "Cannot initialize network"
 msgstr "无法初始化网络"
 
-#: src/modules/tasks/e_mod_main.c:318 src/modules/tasks/e_mod_main.c:735
-msgid "Tasks"
-msgstr "任务栏"
+#: src/modules/syscon/e_int_config_syscon.c:43
+msgid "Syscon Settings"
+msgstr "Syscon 设置"
+
+#: src/modules/syscon/e_int_config_syscon.c:151
+msgid "Secondary"
+msgstr "次要"
+
+#: src/modules/syscon/e_int_config_syscon.c:156
+msgid "Extra"
+msgstr "额外"
+
+#: src/modules/syscon/e_int_config_syscon.c:161
+msgid "Icon Sizes"
+msgstr "图标尺寸"
+
+#: src/modules/syscon/e_int_config_syscon.c:165
+msgid "Do default action after timeout"
+msgstr "超时后做默认动作"
+
+#: src/modules/syscon/e_int_config_syscon.c:172
+msgid "Default Action"
+msgstr "默认动作"
+
+#: src/modules/syscon/e_mod_main.c:31
+msgid "System Controls"
+msgstr "系统控制"
+
+#: src/modules/syscon/e_mod_main.c:37
+msgid "Syscon"
+msgstr "Syscon"
+
+#: src/modules/systray/e_mod_main.c:255
+msgid "Another systray exists"
+msgstr "有另一个系统托盘存在"
+
+#: src/modules/systray/e_mod_main.c:256
+msgid "There can be only one systray gadget and another one already exists."
+msgstr "只允许一个系统托盘的组件，目前已经有了一个。"
+
+#: src/modules/systray/e_mod_main.c:264 src/modules/systray/e_mod_xembed.c:395
+msgid "Systray Error"
+msgstr "系统托盘出错"
+
+#: src/modules/systray/e_mod_main.c:265
+msgid "Systray cannot work in a shelf that is set to below everything."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:417
+msgid "Systray"
+msgstr "系统托盘"
+
+#: src/modules/systray/e_mod_xembed.c:396
+msgid "Systray cannot set its background invisible to match its shelf."
+msgstr ""
 
 #: src/modules/tasks/e_mod_config.c:34
 msgid "Tasks Configuration"
@@ -10374,6 +12204,66 @@ msgstr "%1.0f 像素"
 msgid "Item height"
 msgstr "项目高度"
 
+#: src/modules/tasks/e_mod_main.c:318 src/modules/tasks/e_mod_main.c:735
+msgid "Tasks"
+msgstr "任务栏"
+
+#: src/modules/temperature/e_mod_config.c:56
+msgid "Temperature Settings"
+msgstr "温度设定"
+
+#: src/modules/temperature/e_mod_config.c:217
+msgid "Sensors"
+msgstr "传感器"
+
+#: src/modules/temperature/e_mod_config.c:223
+msgid "Celsius"
+msgstr "摄氏"
+
+#: src/modules/temperature/e_mod_config.c:226
+msgid "Fahrenheit"
+msgstr "华氏"
+
+#: src/modules/temperature/e_mod_config.c:229
+msgid "Display Units"
+msgstr "显示单位"
+
+#: src/modules/temperature/e_mod_config.c:236
+msgid "Check Interval"
+msgstr "检查间隔"
+
+#: src/modules/temperature/e_mod_config.c:240
+msgid "High Temperature"
+msgstr "高温"
+
+#: src/modules/temperature/e_mod_config.c:244
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:314
+#: src/modules/temperature/e_mod_config.c:315
+#, c-format
+msgid "%1.0f F"
+msgstr "%1.0f F"
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:260
+#: src/modules/temperature/e_mod_config.c:325
+#: src/modules/temperature/e_mod_config.c:326
+#, c-format
+msgid "%1.0f C"
+msgstr "%1.0f C"
+
+#: src/modules/temperature/e_mod_config.c:252
+msgid "Low Temperature"
+msgstr "低温"
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Temperatures"
+msgstr "温度"
+
+#: src/modules/temperature/e_mod_main.c:173
+msgid "Temperature"
+msgstr "温度"
+
 #: src/modules/tiling/e_mod_config.c:135
 msgid "columns"
 msgstr "列"
@@ -10403,329 +12293,442 @@ msgstr ""
 msgid "Tiling Configuration"
 msgstr "平铺配置"
 
-#: src/modules/tiling/e_mod_tiling.c:3792
-#: src/modules/tiling/e_mod_tiling.c:3856
+#: src/modules/tiling/e_mod_tiling.c:3798
+#: src/modules/tiling/e_mod_tiling.c:3862
 msgid "Tiling"
 msgstr "平铺"
 
-#: src/modules/tiling/e_mod_tiling.c:3799
+#: src/modules/tiling/e_mod_tiling.c:3805
 msgid "Toggle floating"
 msgstr "切换悬浮"
 
-#: src/modules/tiling/e_mod_tiling.c:3802
+#: src/modules/tiling/e_mod_tiling.c:3808
 msgid "Add a stack"
 msgstr "添加堆叠"
 
-#: src/modules/tiling/e_mod_tiling.c:3805
+#: src/modules/tiling/e_mod_tiling.c:3811
 msgid "Remove a stack"
 msgstr "移除堆叠"
 
-#: src/modules/tiling/e_mod_tiling.c:3808
+#: src/modules/tiling/e_mod_tiling.c:3814
 msgid "Toggle between rows and columns"
 msgstr "在行列之间切换"
 
-#: src/modules/tiling/e_mod_tiling.c:3811
+#: src/modules/tiling/e_mod_tiling.c:3817
 msgid "Swap a window with an other"
 msgstr "在窗口间交换"
 
-#: src/modules/tiling/e_mod_tiling.c:3815
+#: src/modules/tiling/e_mod_tiling.c:3821
 msgid "Move window"
 msgstr "移动窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3818
+#: src/modules/tiling/e_mod_tiling.c:3824
 msgid "Move window to the left"
 msgstr "左移窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3821
+#: src/modules/tiling/e_mod_tiling.c:3827
 msgid "Move window to the right"
 msgstr "右移窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3824
+#: src/modules/tiling/e_mod_tiling.c:3830
 msgid "Move window up"
 msgstr "上移窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3827
+#: src/modules/tiling/e_mod_tiling.c:3833
 msgid "Move window down"
 msgstr "下移窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3831
+#: src/modules/tiling/e_mod_tiling.c:3837
 msgid "Adjust transitions"
 msgstr "调整过渡"
 
-#: src/modules/tiling/e_mod_tiling.c:3834
+#: src/modules/tiling/e_mod_tiling.c:3840
 msgid "Focus a particular window"
 msgstr "聚焦到特定窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3838
+#: src/modules/tiling/e_mod_tiling.c:3844
 msgid "Send to upper right corner"
 msgstr "发送到右上角"
 
-#: src/modules/tiling/e_mod_tiling.c:3841
+#: src/modules/tiling/e_mod_tiling.c:3847
 msgid "Send to upper left corner"
 msgstr "发送到左上角"
 
-#: src/modules/tiling/e_mod_tiling.c:3844
+#: src/modules/tiling/e_mod_tiling.c:3850
 msgid "Send to lower right corner"
 msgstr "发送到右下角"
 
-#: src/modules/tiling/e_mod_tiling.c:3847
+#: src/modules/tiling/e_mod_tiling.c:3853
 msgid "Send to lower left corner"
 msgstr "发送到左下角"
 
-#: src/modules/tiling/e_mod_tiling.c:3910
+#: src/modules/tiling/e_mod_tiling.c:3916
 #, fuzzy
 msgid "Tiling settings"
 msgstr "对话框设置"
 
-#: src/modules/tiling/e_mod_tiling.c:3910
-#: src/modules/tiling/e_mod_tiling.c:3915
-#: src/modules/tiling/e_mod_tiling.c:3917
-#: src/modules/tiling/e_mod_tiling.c:3919
+#: src/modules/tiling/e_mod_tiling.c:3916
+#: src/modules/tiling/e_mod_tiling.c:3921
 #: src/modules/tiling/e_mod_tiling.c:3923
-#: src/modules/tiling/e_mod_tiling.c:3924
 #: src/modules/tiling/e_mod_tiling.c:3925
-#: src/modules/tiling/e_mod_tiling.c:4050
-#: src/modules/tiling/e_mod_tiling.c:4051
-#: src/modules/tiling/e_mod_tiling.c:4052
+#: src/modules/tiling/e_mod_tiling.c:3929
+#: src/modules/tiling/e_mod_tiling.c:3930
+#: src/modules/tiling/e_mod_tiling.c:3931
+#: src/modules/tiling/e_mod_tiling.c:4056
+#: src/modules/tiling/e_mod_tiling.c:4057
+#: src/modules/tiling/e_mod_tiling.c:4058
 #, fuzzy
 msgid "tiling"
 msgstr "平铺"
 
-#: src/modules/tiling/e_mod_tiling.c:3915
+#: src/modules/tiling/e_mod_tiling.c:3921
 #, fuzzy
 msgid "Tile dialog windows"
 msgstr "所有窗口"
 
-#: src/modules/tiling/e_mod_tiling.c:3915
-#, fuzzy
-msgid "dialog"
-msgstr "对话框"
-
-#: src/modules/tiling/e_mod_tiling.c:3915
-#, fuzzy
-msgid "placement"
-msgstr "放置"
-
-#: src/modules/tiling/e_mod_tiling.c:3917
+#: src/modules/tiling/e_mod_tiling.c:3923
 #, fuzzy
 msgid "Show window titles when tiling"
 msgstr "显示窗口标题"
 
-#: src/modules/tiling/e_mod_tiling.c:3919
+#: src/modules/tiling/e_mod_tiling.c:3925
 #, fuzzy
 msgid "Tiling key hints"
 msgstr "键绑定"
 
-#: src/modules/xkbswitch/e_mod_main.c:83
-#, fuzzy
-msgid "xkb layouts"
-msgstr "下一个键盘布局"
+#: src/modules/winlist/e_int_config_winlist.c:52
+msgid "Window Switcher Settings"
+msgstr "窗口切换设置"
 
-#: src/modules/xkbswitch/e_mod_main.c:83
-#, fuzzy
-msgid "Keyboard layout settings"
-msgstr "键盘设置"
+#: src/modules/winlist/e_int_config_winlist.c:181
+msgid "Windows from other desks"
+msgstr "来自其他桌面的窗口"
 
-#: src/modules/xkbswitch/e_mod_main.c:207
-msgid "NONE"
-msgstr ""
+#: src/modules/winlist/e_int_config_winlist.c:184
+msgid "Windows from other screens"
+msgstr "来自其他屏幕的窗口"
 
-#: src/modules/xkbswitch/e_mod_config.c:74
-msgid "Keyboard Settings"
-msgstr "键盘设置"
+#: src/modules/winlist/e_int_config_winlist.c:187
+msgid "Iconified"
+msgstr "图标化"
 
-#: src/modules/xkbswitch/e_mod_config.c:264
-msgid "Configurations"
-msgstr "配置"
+#: src/modules/winlist/e_int_config_winlist.c:189
+msgid "Iconified from other desks"
+msgstr "来自其他桌面图标化程序"
 
-#: src/modules/xkbswitch/e_mod_config.c:271
-msgid "Models"
-msgstr "型号"
+#: src/modules/winlist/e_int_config_winlist.c:193
+msgid "Iconified from other screens"
+msgstr "来自其他屏幕图标化程序"
 
-#: src/modules/xkbswitch/e_mod_config.c:277
-msgid "Do not apply any keyboard settings ever"
+#: src/modules/winlist/e_int_config_winlist.c:205
+msgid "Uniconify/Unshade"
 msgstr ""
 
-#: src/modules/xkbswitch/e_mod_config.c:279
-#, fuzzy
-msgid "Label only in gadgets"
-msgstr "仅标签"
+#: src/modules/winlist/e_int_config_winlist.c:207
+msgid "Warp mouse while selecting"
+msgstr "选择时鼠标可以回绕"
 
-#: src/modules/xkbswitch/e_mod_config.c:463
-msgid "Add New Configuration"
-msgstr "添加新配置"
+#: src/modules/winlist/e_int_config_winlist.c:211
+msgid "Warp mouse at end"
+msgstr "从尾部回绕"
 
-#: src/modules/xkbswitch/e_mod_config.c:472
-msgid "Available"
-msgstr "可用"
+#: src/modules/winlist/e_int_config_winlist.c:215
+msgid "Disable mouse warp on directional focus change"
+msgstr ""
 
-#: src/modules/xkbswitch/e_mod_config.c:477
-#, fuzzy
-msgid "Model"
-msgstr "模式"
+#: src/modules/winlist/e_int_config_winlist.c:219
+msgid "Jump to desk"
+msgstr "跳转到桌面"
 
-#: src/modules/xkbswitch/e_mod_config.c:482
-msgid "Variant"
-msgstr ""
+#: src/modules/winlist/e_int_config_winlist.c:221
+msgid "Selecting"
+msgstr "选择"
 
-#: src/modules/notification/e_mod_main.c:55
-msgid "Enter Presentation Mode"
-msgstr "进入演示模式"
+#: src/modules/winlist/e_int_config_winlist.c:225
+msgid "Scroll Animation"
+msgstr "滚动动画"
 
-#: src/modules/notification/e_mod_main.c:56
-msgid ""
-"Enlightenment is in <b>presentation</b> mode.<br>During presentation mode, "
-"screen saver, lock and power saving will be disabled so you are not "
-"interrupted."
-msgstr ""
-"Enlightenment 处于<b>演示</b>模式。<br>在“演示”模式，屏幕保护，时钟和省电功能"
-"将被禁用，所以不会被中断。"
+#: src/modules/winlist/e_int_config_winlist.c:228
+msgid "Scroll speed"
+msgstr "滚屏速度"
 
-#: src/modules/notification/e_mod_main.c:62
-msgid "Exited Presentation Mode"
-msgstr "离开演示模式"
+#: src/modules/winlist/e_int_config_winlist.c:239
+msgid "Minimum width"
+msgstr "最小宽度"
 
-#: src/modules/notification/e_mod_main.c:63
-msgid ""
-"Presentation mode is over.<br>Now screen saver, lock and power saving "
-"settings will be restored."
-msgstr "演示模式结束。<br>现在屏幕保护，时钟和省电功能恢复正常。"
+#: src/modules/winlist/e_int_config_winlist.c:241
+#: src/modules/winlist/e_int_config_winlist.c:248
+#: src/modules/winlist/e_int_config_winlist.c:254
+#: src/modules/winlist/e_int_config_winlist.c:261
+#, c-format
+msgid "%4.0f"
+msgstr "%4.0f"
 
-#: src/modules/notification/e_mod_main.c:78
-msgid "Enter Offline Mode"
-msgstr "进入脱机模式"
+#: src/modules/winlist/e_int_config_winlist.c:246
+msgid "Maximum width"
+msgstr "最大宽度"
 
-#: src/modules/notification/e_mod_main.c:79
-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>在脱机模式下，使用网络的模块将不会查询"
-"远程服务。。"
+#: src/modules/winlist/e_int_config_winlist.c:252
+msgid "Minimum height"
+msgstr "最小高度"
 
-#: src/modules/notification/e_mod_main.c:85
-msgid "Exited Offline Mode"
-msgstr "成功离开脱机模式"
+#: src/modules/winlist/e_int_config_winlist.c:259
+msgid "Maximum height"
+msgstr "最大高度"
 
-#: src/modules/notification/e_mod_main.c:86
-msgid ""
-"Now in <b>online</b> mode.<br>Now modules that use network will resume "
-"regular tasks."
-msgstr "现在处于<b>在线</b>模式。<br>从现在起程序恢复与网络的接连。"
+#: src/modules/winlist/e_int_config_winlist.c:269
+msgid "Horizontal alignment"
+msgstr "水平排列"
 
-#: src/modules/notification/e_mod_main.c:184
-msgid "Notification"
-msgstr "通知"
+#: src/modules/winlist/e_int_config_winlist.c:274
+msgid "Vertical alignment"
+msgstr "垂直排列"
 
-#: src/modules/notification/e_mod_main.c:205
-msgid "Notification Module"
-msgstr "通知模块"
+#: src/modules/winlist/e_int_config_winlist.c:279
+msgid "Alignment"
+msgstr "对齐"
 
-#: src/modules/notification/e_mod_main.c:221
-msgid "Error during notification server initialization"
-msgstr ""
+#: src/modules/winlist/e_mod_main.c:28
+msgid "Window Switcher"
+msgstr "窗口切换"
 
-#: src/modules/notification/e_mod_main.c:222
-#, fuzzy
-msgid ""
-"Ensure there's no other module acting as a server and that D-Bus is "
-"correctly installed and  running"
-msgstr "DBus 初始化出错！请检查 dbug 是否已经安装正确并已运行。"
+#: src/modules/winlist/e_mod_main.c:41
+msgid "Next Window"
+msgstr "下一窗口"
 
-#: src/modules/notification/e_mod_main.c:239
-#, fuzzy
-msgid "Display low urgency notifications"
-msgstr "显示边界标题"
+#: src/modules/winlist/e_mod_main.c:43
+msgid "Previous Window"
+msgstr "前一窗口"
 
-#: src/modules/notification/e_mod_main.c:239
-#: src/modules/notification/e_mod_main.c:240
-#: src/modules/notification/e_mod_main.c:241
-#: src/modules/notification/e_mod_main.c:242
-#: src/modules/notification/e_mod_main.c:243
-#: src/modules/notification/e_mod_main.c:245
-#: src/modules/notification/e_mod_main.c:249
-#: src/modules/notification/e_mod_main.c:250
-#: src/modules/notification/e_mod_main.c:251
-#: src/modules/notification/e_mod_main.c:274
-#: src/modules/notification/e_mod_main.c:275
-#, fuzzy
-msgid "notification"
-msgstr "通知"
+#: src/modules/winlist/e_mod_main.c:46
+msgid "Next window of same class"
+msgstr "同一类的下一窗口"
 
-#: src/modules/notification/e_mod_main.c:240
-#, fuzzy
-msgid "Display normal urgency notifications"
-msgstr "显示信息"
+#: src/modules/winlist/e_mod_main.c:49
+msgid "Previous window of same class"
+msgstr "同一类的上一窗口"
 
-#: src/modules/notification/e_mod_main.c:241
-#, fuzzy
-msgid "Display high urgency notifications"
-msgstr "显示信息"
+#: src/modules/winlist/e_mod_main.c:52
+msgid "Next window class"
+msgstr "下一窗口类"
 
-#: src/modules/notification/e_mod_main.c:242
-msgid "Force a specified timeout on all notifications"
+#: src/modules/winlist/e_mod_main.c:55
+msgid "Previous window class"
+msgstr "上一窗口类"
+
+#: src/modules/winlist/e_mod_main.c:57
+msgid "Window on the Left"
+msgstr "左边的窗口"
+
+#: src/modules/winlist/e_mod_main.c:59
+msgid "Window Down"
+msgstr "下移窗口"
+
+#: src/modules/winlist/e_mod_main.c:61
+msgid "Window Up"
+msgstr "上移窗口"
+
+#: src/modules/winlist/e_mod_main.c:63
+msgid "Window on the Right"
+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
+msgid "Winlist Error"
+msgstr "Winlist 错误"
+
+#: src/modules/winlist/e_mod_main.c:209
+msgid "Winlist cannot be activated from an edge binding"
 msgstr ""
 
-#: src/modules/notification/e_mod_main.c:243
-msgid "Timeout to force on notifications"
+#: src/modules/winlist/e_mod_main.c:215
+msgid "Winlist cannot be activated from a signal binding"
 msgstr ""
 
-#: src/modules/notification/e_mod_main.c:245
-msgid "Corner in which to display notifications"
+#: src/modules/winlist/e_mod_main.c:221
+msgid "Winlist cannot be activated from an ACPI binding"
 msgstr ""
 
-#: src/modules/notification/e_mod_config.c:51
-msgid "Notification Settings"
-msgstr "通知设置"
+#: src/modules/winlist/e_winlist.c:157
+msgid "Select a window"
+msgstr "选择一个窗口"
 
-#: src/modules/notification/e_mod_config.c:99
-msgid "Urgency"
-msgstr "紧急程度"
+#: src/modules/wizard/e_wizard.c:233 src/modules/wizard/e_wizard.c:262
+msgid "Next"
+msgstr "下一步"
 
-#: src/modules/notification/e_mod_config.c:100
-msgid "Levels of urgency to display:"
-msgstr "显示紧急级别:"
+#: src/modules/wizard/e_wizard.c:267
+msgid "Please Wait..."
+msgstr "请稍候..."
 
-#: src/modules/notification/e_mod_config.c:106
-msgid "Critical"
-msgstr "严重"
+#: src/modules/wizard/e_wizard.c:283
+msgid "Welcome to Enlightenment"
+msgstr "欢迎光临Enlightenment"
 
-#: src/modules/notification/e_mod_config.c:110
-msgid "Default Timeout"
-msgstr "默认延时"
+#: src/modules/wizard/page_010.c:161 src/modules/wizard/page_011.c:147
+#: src/modules/wizard/page_020.c:52
+msgid "Select one"
+msgstr "选择一个"
 
-#: src/modules/notification/e_mod_config.c:111
-msgid "Force timeout for all notifications"
+#: src/modules/wizard/page_020.c:51
+msgid "Profile"
+msgstr "配置文件"
+
+#: src/modules/wizard/page_040.c:36
+msgid "Adding missing App files"
+msgstr "添加缺失的应用程序文件"
+
+#: src/modules/wizard/page_050.c:130
+msgid "Select preferred size"
+msgstr "选择首选大小"
+
+#: src/modules/wizard/page_060.c:29
+msgid "Focus by ..."
+msgstr "聚焦方式..."
+
+#: src/modules/wizard/page_060.c:36
+msgid "Mouse Over"
+msgstr "鼠标悬停"
+
+#: src/modules/wizard/page_110.c:13
+msgid "Network Management"
+msgstr "网络管理"
+
+#: src/modules/wizard/page_110.c:17
+msgid "Connman network service not found"
+msgstr "未发现 Connman 网络服务"
+
+#: src/modules/wizard/page_110.c:20
+msgid "Install Connman for network management support"
+msgstr "为网络管理支持安装 Connman"
+
+#: src/modules/wizard/page_110.c:23
+msgid "Connman support disabled"
+msgstr "Connman 支持已禁用"
+
+#: src/modules/wizard/page_110.c:26
+msgid "Install/Enable Connman for network management support"
+msgstr "为网络管理支持安装或启用 Connman"
+
+#: src/modules/wizard/page_110.c:162
+msgid "Checking to see if Connman exists"
+msgstr "正在检查 Connman 是否存在"
+
+#: src/modules/wizard/page_150.c:61
+msgid "Compositing"
+msgstr "混成"
+
+#: src/modules/wizard/page_150.c:85
+msgid "Hardware Accelerated (OpenGL)"
+msgstr "硬件加速(OpenGL)"
+
+#: src/modules/wizard/page_150.c:88
+msgid "Tear-free Rendering (OpenGL only)"
+msgstr "Tear-free 渲染(仅 OpenGL)"
+
+#: src/modules/wizard/page_170.c:24
+msgid "Updates"
+msgstr "更新"
+
+#: src/modules/wizard/page_170.c:26
+msgid "Check for available updates"
+msgstr "检查可用更新"
+
+#: src/modules/wizard/page_170.c:32
+#, fuzzy
+msgid ""
+"Enlightenment can check for new<br>versions, updates, security "
+"and<br>bugfixes, as well as available add-ons.<br><br>This is very useful, "
+"because it lets<br>you know about available bug fixes and<br>security fixes "
+"when they happen. As a<br>result, Enlightenment will connect "
+"to<br>enlightenment.org and transmit some<br>information, much like any web "
+"browser<br>might do. No personal information such as<br>username, password "
+"or any personal files<br>will be transmitted. If you don't like this,"
+"<br>please disable this below. It is highly<br>advised that you do 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/notification/e_mod_config.c:130
-msgid "Popup Corner"
-msgstr "弹出角"
+#: src/modules/wizard/page_170.c:53
+msgid "Enable update checking"
+msgstr "启用更新检查"
 
-#: src/modules/notification/e_mod_config.c:132
-msgid "Top left"
-msgstr "左上"
+#: src/modules/wizard/page_180.c:26
+msgid "Information"
+msgstr "信息"
 
-#: src/modules/notification/e_mod_config.c:134
-msgid "Top right"
-msgstr "右上"
+#: src/modules/wizard/page_180.c:32
+msgid "A taskbar can be added to<br>show open windows and applications."
+msgstr "可以添加任务栏以显示打开的窗口和应用程序。"
 
-#: src/modules/notification/e_mod_config.c:136
-msgid "Bottom left"
-msgstr "左下"
+#: src/modules/wizard/page_180.c:38
+msgid "Enable Taskbar"
+msgstr "启用任务栏"
 
-#: src/modules/notification/e_mod_config.c:138
-msgid "Bottom right"
-msgstr "右下"
+#: src/modules/xkbswitch/e_mod_config.c:74
+msgid "Keyboard Settings"
+msgstr "键盘设置"
 
-#: src/modules/notification/e_mod_config.c:150
-msgid "Ignore replace ID"
+#: src/modules/xkbswitch/e_mod_config.c:264
+msgid "Configurations"
+msgstr "配置"
+
+#: src/modules/xkbswitch/e_mod_config.c:271
+msgid "Models"
+msgstr "型号"
+
+#: src/modules/xkbswitch/e_mod_config.c:277
+msgid "Do not apply any keyboard settings ever"
 msgstr ""
 
-#: src/modules/notification/e_mod_config.c:152
-msgid "Use multiple monitor geometry"
+#: src/modules/xkbswitch/e_mod_config.c:279
+#, fuzzy
+msgid "Label only in gadgets"
+msgstr "仅标签"
+
+#: src/modules/xkbswitch/e_mod_config.c:463
+msgid "Add New Configuration"
+msgstr "添加新配置"
+
+#: src/modules/xkbswitch/e_mod_config.c:472
+msgid "Available"
+msgstr "可用"
+
+#: src/modules/xkbswitch/e_mod_config.c:477
+#, fuzzy
+msgid "Model"
+msgstr "模式"
+
+#: src/modules/xkbswitch/e_mod_config.c:482
+msgid "Variant"
+msgstr ""
+
+#: src/modules/xkbswitch/e_mod_main.c:83
+#, fuzzy
+msgid "xkb layouts"
+msgstr "下一个键盘布局"
+
+#: src/modules/xkbswitch/e_mod_main.c:83
+#, fuzzy
+msgid "Keyboard layout settings"
+msgstr "键盘设置"
+
+#: src/modules/xkbswitch/e_mod_main.c:207
+msgid "NONE"
 msgstr ""
 
+#~ msgid "Pane"
+#~ msgstr "面板"
+
+#~ msgid "Zoom"
+#~ msgstr "缩放"
+
 #~ msgid "Output"
 #~ msgstr "输出"
 
@@ -10759,44 +12762,6 @@ msgstr ""
 #~ msgid "%li Minutes"
 #~ msgstr "%li 分钟"
 
-#~ msgid "Compositor Error"
-#~ msgstr "合成器错误"
-
-#~ msgid "Another compositor is already running<br>on your display server."
-#~ msgstr "已有其他和称其运行在您的显示服务器上。。"
-
-#~ msgid ""
-#~ "Your display server does not support the<br>compositor overlay window. "
-#~ "This is needed<br>for it to function."
-#~ msgstr ""
-#~ "您的显示服务器不支持合成器覆盖窗口。<br>合成器必须此功能方可正常工作。"
-
-#~ msgid "Compositor Warning"
-#~ msgstr "合成器告警"
-
-#~ 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 引擎。现在使用软件引擎。"
-
-#~ 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 "
-#~ "支持。"
-
-#~ msgid ""
-#~ "Your display server does not support XDamage<br>or Ecore was built "
-#~ "without XDamage support."
-#~ msgstr ""
-#~ "您的显示服务器不支持 XDamage<br>或 Ecore 编译时未开启 XDamage 支持。"
-
 #~ msgid "Unused"
 #~ msgstr "未使用"
 
@@ -10812,9 +12777,6 @@ msgstr ""
 #~ msgid "Menu (Popup)"
 #~ msgstr "菜单(弹出)"
 
-#~ msgid "Splash"
-#~ msgstr "Splash"
-
 #~ msgid "Tooltip"
 #~ msgstr "提示"
 
@@ -10865,24 +12827,6 @@ msgstr ""
 #~ "the<br>Dropshadow module."
 #~ msgstr "阴影模块与复合<br>不兼容。禁用阴<br>影模块。"
 
-#~ msgid "Configuration Panel"
-#~ msgstr "配置面板"
-
-#~ msgid "Show configurations in menu"
-#~ msgstr "在菜单里显示配置"
-
-#~ msgid "Settings Panel"
-#~ msgstr "设置面板"
-
-#~ msgid "Offline"
-#~ msgstr "脱机"
-
-#~ msgid "Modes"
-#~ msgstr "模式"
-
-#~ msgid "Desktop Name"
-#~ msgstr "桌面名称"
-
 #~ msgid "Presentation mode enabled"
 #~ msgstr "启用演示模式"
 
@@ -10922,9 +12866,6 @@ msgstr ""
 #~ msgid "Very Sharp"
 #~ msgstr "很清晰"
 
-#~ msgid "Shadow Distance"
-#~ msgstr "阴影距离"
-
 #~ msgid "Very Far"
 #~ msgstr "很远"
author	Carsten Haitzler (Rasterman) <raster@rasterman.com>	2013-05-06 17:33:39 +0900
committer	Carsten Haitzler (Rasterman) <raster@rasterman.com>	2013-05-06 17:33:39 +0900
commit	b17a694f0488b8b9612a1583935d77f20af7380d (patch)
tree	747222227b76718da096c489fa1eceecc1ff7138 /po/zh_CN.po
parent	60c687415a88f2d136146574aaaaaccb3058e4ca (diff)
download	enlightenment-b17a694f0488b8b9612a1583935d77f20af7380d.tar.gz