update po's

1 files changed, 699 insertions, 474 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4a7de33c34..8e0ed7e792 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-05-06 11:45+0900\n"
+"POT-Creation-Date: 2013-05-13 13:08+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"
@@ -27,7 +27,7 @@ msgid "About Enlightenment"
 msgstr "关于 Enlightenment"
 
 #: 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_fm.c:1079 src/bin/e_int_border_menu.c:209
 #: 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
@@ -38,7 +38,7 @@ msgid "Close"
 msgstr "关闭"
 
 #: 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/bin/e_actions.c:3370 src/bin/e_int_menus.c:224 src/bin/e_main.c:666
 #: 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
@@ -76,7 +76,7 @@ msgid "Are you sure you want to kill this window?"
 msgstr "确定要杀死这个窗口吗？"
 
 #: src/bin/e_actions.c:373 src/bin/e_actions.c:2995
-#: src/bin/e_int_border_menu.c:748
+#: src/bin/e_int_border_menu.c:774
 msgid "Kill"
 msgstr "杀死"
 
@@ -154,12 +154,12 @@ msgstr "您确定要休眠您的电脑吗？"
 msgid "Window : Actions"
 msgstr "窗口：动作"
 
-#: src/bin/e_actions.c:2950 src/bin/e_fm.c:11604
-#: src/bin/e_int_border_menu.c:668
+#: src/bin/e_actions.c:2950 src/bin/e_fm.c:11606
+#: src/bin/e_int_border_menu.c:694
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:2961 src/bin/e_int_border_menu.c:682
+#: src/bin/e_actions.c:2961 src/bin/e_int_border_menu.c:708
 msgid "Resize"
 msgstr "改变大小"
 
@@ -173,12 +173,12 @@ msgstr "菜单"
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2980 src/bin/e_int_border_menu.c:1064
+#: src/bin/e_actions.c:2980 src/bin/e_int_border_menu.c:1090
 #: src/modules/winlist/e_int_config_winlist.c:203
 msgid "Raise"
 msgstr "提升"
 
-#: src/bin/e_actions.c:2985 src/bin/e_int_border_menu.c:1072
+#: src/bin/e_actions.c:2985 src/bin/e_int_border_menu.c:1098
 msgid "Lower"
 msgstr "降低"
 
@@ -218,24 +218,24 @@ msgstr "全屏状态切换"
 msgid "Fullscreen Mode Enable"
 msgstr "全屏模式开启"
 
-#: src/bin/e_actions.c:3027 src/bin/e_int_border_menu.c:383
-#: src/bin/e_int_border_menu.c:643
+#: src/bin/e_actions.c:3027 src/bin/e_int_border_menu.c:409
+#: src/bin/e_int_border_menu.c:669
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:3029 src/bin/e_int_border_menu.c:394
+#: src/bin/e_actions.c:3029 src/bin/e_int_border_menu.c:420
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:3032 src/bin/e_int_border_menu.c:405
+#: src/bin/e_actions.c:3032 src/bin/e_int_border_menu.c:431
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:3035 src/bin/e_int_border_menu.c:416
+#: src/bin/e_actions.c:3035 src/bin/e_int_border_menu.c:442
 msgid "Maximize Left"
 msgstr "左屏最大化"
 
-#: src/bin/e_actions.c:3038 src/bin/e_int_border_menu.c:427
+#: src/bin/e_actions.c:3038 src/bin/e_int_border_menu.c:453
 msgid "Maximize Right"
 msgstr "右屏最大化"
 
@@ -317,7 +317,8 @@ msgstr "切换粘附状态"
 #: 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
+#: src/modules/fileman/e_mod_menu.c:425 src/modules/gadman/e_mod_gadman.c:117
+#: src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "桌面"
 
@@ -662,7 +663,6 @@ msgstr "显示菜单..."
 
 #: 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"
@@ -673,7 +673,7 @@ msgid "Command"
 msgstr "命令"
 
 #: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:694
-#: src/bin/e_int_border_menu.c:117
+#: src/bin/e_int_border_menu.c:119
 #, c-format
 msgid "Application"
 msgstr "应用程序"
@@ -817,11 +817,11 @@ msgstr "选择"
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_comp.c:4077
+#: src/bin/e_comp.c:4117
 msgid "Compositor Warning"
 msgstr "合成器告警"
 
-#: src/bin/e_comp.c:4077
+#: src/bin/e_comp.c:4117
 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 "
@@ -830,71 +830,71 @@ msgstr ""
 "您的显示服务器不支持 OpenGL<br> 或 Evas 及 Ecore-Evas 编译时没有开启任何"
 "<br>OpenGL 引擎。现在使用软件引擎。"
 
-#: src/bin/e_comp.c:4096 src/bin/e_comp.c:4118
+#: src/bin/e_comp.c:4136 src/bin/e_comp.c:4158
 msgid "Compositor Error"
 msgstr "合成器错误"
 
-#: src/bin/e_comp.c:4096
+#: src/bin/e_comp.c:4136
 msgid "Another compositor is already running<br>on your display server."
 msgstr "已有其他和称其运行在您的显示服务器上。。"
 
-#: src/bin/e_comp.c:4118
+#: src/bin/e_comp.c:4158
 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/bin/e_comp.c:4494 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
+#: src/bin/e_comp.c:4499 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
+#: src/bin/e_comp.c:4504 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/bin/e_comp.c:4509 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_comp.c:4558 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
+#: src/bin/e_comp.c:4641
 #, 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/bin/e_comp.c:4641 src/bin/e_comp.c:4643 src/bin/e_comp.c:4645
+#: src/bin/e_comp.c:4647 src/bin/e_comp.c:4649 src/bin/e_comp.c:4652
+#: src/bin/e_comp.c:4654 src/bin/e_comp.c:4656 src/bin/e_comp.c:4658
+#: src/bin/e_comp.c:4660 src/bin/e_comp.c:4662 src/bin/e_comp.c:4666
+#: src/bin/e_comp.c:4670 src/bin/e_comp.c:4675 src/bin/e_comp.c:4678
+#: src/bin/e_comp.c:4681 src/bin/e_comp.c:4684 src/bin/e_comp.c:4687
+#: src/bin/e_comp.c:4694 src/bin/e_comp.c:4697 src/bin/e_comp.c:4704
+#: src/bin/e_comp.c:4712 src/bin/e_comp.c:4714 src/bin/e_comp.c:4716
+#: src/bin/e_comp.c:4719 src/bin/e_comp.c:4721 src/bin/e_comp.c:4724
+#: src/bin/e_comp.c:4728 src/bin/e_comp.c:4729 src/bin/e_comp.c:4730
+#: src/bin/e_comp.c:4956 src/bin/e_comp.c:4957
 #: 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_comp.c:4641 src/bin/e_comp.c:4652 src/bin/e_comp.c:4666
+#: src/bin/e_comp.c:4670 src/bin/e_comp.c:4675 src/bin/e_comp.c:4678
+#: src/bin/e_comp.c:4681 src/bin/e_comp.c:4684 src/bin/e_comp.c:4687
+#: src/bin/e_comp.c:4694 src/bin/e_comp.c:4697 src/bin/e_comp.c:4704
+#: src/bin/e_comp.c:4712 src/bin/e_comp.c:4714 src/bin/e_comp.c:4716
+#: src/bin/e_comp.c:4719 src/bin/e_comp.c:4721 src/bin/e_comp.c:4724
 #: 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
@@ -957,10 +957,10 @@ msgstr "混成"
 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_comp.c:4641 src/bin/e_comp.c:4643 src/bin/e_comp.c:4645
+#: src/bin/e_comp.c:4647 src/bin/e_comp.c:4649 src/bin/e_comp.c:4652
+#: src/bin/e_comp.c:4654 src/bin/e_comp.c:4656 src/bin/e_comp.c:4658
+#: src/bin/e_comp.c:4660 src/bin/e_comp.c:4662 src/bin/e_comp.c:4670
 #: 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
@@ -974,10 +974,10 @@ msgstr "边框"
 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_comp.c:4641 src/bin/e_comp.c:4643 src/bin/e_comp.c:4645
+#: src/bin/e_comp.c:4647 src/bin/e_comp.c:4649 src/bin/e_comp.c:4652
+#: src/bin/e_comp.c:4654 src/bin/e_comp.c:4656 src/bin/e_comp.c:4658
+#: src/bin/e_comp.c:4660 src/bin/e_comp.c:4662
 #: 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
@@ -989,12 +989,12 @@ msgstr "主题"
 msgid "animate"
 msgstr "动画"
 
-#: src/bin/e_comp.c:4603
+#: src/bin/e_comp.c:4643
 #, fuzzy
 msgid "Use fast composite effects for menus"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4603 src/bin/e_comp.c:4614
+#: src/bin/e_comp.c:4643 src/bin/e_comp.c:4654
 #: 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
@@ -1009,57 +1009,57 @@ msgstr "不混合全屏窗口"
 msgid "menu"
 msgstr ""
 
-#: src/bin/e_comp.c:4605
+#: src/bin/e_comp.c:4645
 #, fuzzy
 msgid "Use fast composite effects for popups"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4605 src/bin/e_comp.c:4616
+#: src/bin/e_comp.c:4645 src/bin/e_comp.c:4656
 #, fuzzy
 msgid "popup"
 msgstr "弹出"
 
-#: src/bin/e_comp.c:4607
+#: src/bin/e_comp.c:4647
 #, fuzzy
 msgid "Use fast composite effects for objects"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4609
+#: src/bin/e_comp.c:4649
 #, 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
+#: src/bin/e_comp.c:4652 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
+#: src/bin/e_comp.c:4654 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
+#: src/bin/e_comp.c:4656 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
+#: src/bin/e_comp.c:4658 src/modules/conf_comp/e_mod_config.c:235
 #, fuzzy
 msgid "Disable composite effects for objects"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4620
+#: src/bin/e_comp.c:4660
 #, fuzzy
 msgid ""
 "Disable composite effects for override-redirect windows (tooltips and such)"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4622
+#: src/bin/e_comp.c:4662
 #, 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_comp.c:4662 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
@@ -1077,45 +1077,45 @@ msgstr "不混合全屏窗口"
 msgid "screen"
 msgstr "屏幕"
 
-#: src/bin/e_comp.c:4623
+#: src/bin/e_comp.c:4663
 msgid ""
 "This option disables composite effects from themes, such as animating the "
 "screen fade when blanking"
 msgstr ""
 
-#: src/bin/e_comp.c:4626
+#: src/bin/e_comp.c:4666
 #, fuzzy
 msgid "Compositing engine"
 msgstr "混成"
 
-#: src/bin/e_comp.c:4630
+#: src/bin/e_comp.c:4670
 msgid "Default window composite effect"
 msgstr ""
 
-#: src/bin/e_comp.c:4635
+#: src/bin/e_comp.c:4675
 #, fuzzy
 msgid "Smooth scaling of composited window content"
 msgstr "窗口内容平滑缩放"
 
-#: src/bin/e_comp.c:4638
+#: src/bin/e_comp.c:4678
 #, fuzzy
 msgid "Sync composited windows"
 msgstr "同步窗口"
 
-#: src/bin/e_comp.c:4641
+#: src/bin/e_comp.c:4681
 #, fuzzy
 msgid "Loose sync composited windows"
 msgstr "不混合全屏窗口"
 
-#: src/bin/e_comp.c:4644
+#: src/bin/e_comp.c:4684
 msgid "Grab server during rendering of composited windows"
 msgstr ""
 
-#: src/bin/e_comp.c:4647
+#: src/bin/e_comp.c:4687
 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_comp.c:4687 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
@@ -1131,57 +1131,57 @@ msgstr ""
 msgid "delay"
 msgstr ""
 
-#: src/bin/e_comp.c:4648
+#: src/bin/e_comp.c:4688
 #, fuzzy, c-format
 msgid "%1.2f seconds"
 msgstr "%.2f 秒"
 
-#: src/bin/e_comp.c:4654
+#: src/bin/e_comp.c:4694
 #, fuzzy
 msgid "Tear-free compositing (VSYNC)"
 msgstr "Tear-free 更新(VSynced)"
 
-#: src/bin/e_comp.c:4657
+#: src/bin/e_comp.c:4697
 #, fuzzy
 msgid "Texture from pixmap rendering for composite"
 msgstr "使用位图纹理"
 
-#: src/bin/e_comp.c:4664
+#: src/bin/e_comp.c:4704
 #, fuzzy
 msgid "Composite swapping method"
 msgstr "默认交换方法："
 
-#: src/bin/e_comp.c:4672 src/modules/conf_comp/e_mod_config.c:314
+#: src/bin/e_comp.c:4712 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
+#: src/bin/e_comp.c:4714
 msgid "Send flush when compositing windows"
 msgstr ""
 
-#: src/bin/e_comp.c:4676
+#: src/bin/e_comp.c:4716
 msgid "Send dump when compositing windows"
 msgstr ""
 
-#: src/bin/e_comp.c:4679
+#: src/bin/e_comp.c:4719
 msgid "Show framerate when compositing windows"
 msgstr ""
 
-#: src/bin/e_comp.c:4681
+#: src/bin/e_comp.c:4721
 msgid "Rolling average for fps display when compositing"
 msgstr ""
 
-#: src/bin/e_comp.c:4682
+#: src/bin/e_comp.c:4722
 #, fuzzy, c-format
 msgid "%1.0f frames"
 msgstr "%1.0f 帧"
 
-#: src/bin/e_comp.c:4684
+#: src/bin/e_comp.c:4724
 msgid "Composite framerate display corner"
 msgstr ""
 
-#: src/bin/e_comp.c:4688 src/bin/e_comp.c:4917
+#: src/bin/e_comp.c:4728 src/bin/e_comp.c:4957
 #: 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
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid "windows"
 msgstr "窗口"
 
-#: src/bin/e_comp.c:4772
+#: src/bin/e_comp.c:4812
 #, fuzzy
 msgid ""
 "Your display server does not support XComposite, or Ecore-X was built "
@@ -1206,27 +1206,27 @@ msgstr ""
 "<br>请注意为支持混成，您还需要在<br>X11 和 Ecore 中开启 XRender 和 XFixes 支"
 "持。"
 
-#: src/bin/e_comp.c:4781
+#: src/bin/e_comp.c:4821
 #, 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
+#: src/bin/e_comp.c:4904 src/bin/e_comp.c:4910
 #, fuzzy
 msgid "Compositor"
 msgstr "混成"
 
-#: src/bin/e_comp.c:4865
+#: src/bin/e_comp.c:4905
 msgid "Change current window opacity"
 msgstr ""
 
-#: src/bin/e_comp.c:4871
+#: src/bin/e_comp.c:4911
 msgid "Set current window opacity"
 msgstr ""
 
-#: src/bin/e_config.c:972
+#: src/bin/e_config.c:971
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -1241,7 +1241,7 @@ msgstr ""
 "Enlightenment 需要新的设置，来使用新增功能，<br>新的默认设置会增加进来。<br>"
 "您也可以现在就重新设置各项。<br>很抱歉要让您重新设置。"
 
-#: src/bin/e_config.c:989
+#: src/bin/e_config.c:988
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -1253,18 +1253,18 @@ msgstr ""
 "Enlightenment，或者复制了一个新版的 Enlightenment。<br>这很糟糕，为了防止出"
 "错，已经恢复为初始值。<br>很抱歉不得不这样做。<br>"
 
-#: src/bin/e_config.c:1104
+#: src/bin/e_config.c:1103
 msgid ""
 "Your bindings settings version does not match the current settings version."
 "<br>As a result, all bindings have been reloaded from defaults.<br>Sorry for "
 "the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1653 src/bin/e_config.c:2314
+#: src/bin/e_config.c:1652 src/bin/e_config.c:2313
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 写入设置出错"
 
-#: src/bin/e_config.c:1656
+#: src/bin/e_config.c:1655
 #, c-format
 msgid ""
 "Enlightenment has had an error while moving config files<br>from:<br>"
@@ -1274,7 +1274,7 @@ msgstr ""
 "Enlightenment 在将 <br>%s<br><br> 的配置文件移动至 <br>%s<br><br> 时出错，其"
 "他写操作已安全中止。<br>"
 
-#: src/bin/e_config.c:1666 src/bin/e_config.c:2327
+#: src/bin/e_config.c:1665 src/bin/e_config.c:2326
 #: 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:10013 src/bin/e_fm.c:10744
@@ -1294,91 +1294,91 @@ msgstr ""
 msgid "OK"
 msgstr "确定"
 
-#: src/bin/e_config.c:2205
+#: src/bin/e_config.c:2204
 msgid "Settings Upgraded"
 msgstr "设置已经升级"
 
-#: src/bin/e_config.c:2223
+#: src/bin/e_config.c:2222
 msgid "The EET file handle is bad."
 msgstr "EET 文件句柄非法。"
 
-#: src/bin/e_config.c:2227
+#: src/bin/e_config.c:2226
 msgid "The file data is empty."
 msgstr "该文件数据为空。"
 
-#: src/bin/e_config.c:2231
+#: src/bin/e_config.c:2230
 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:2235
+#: src/bin/e_config.c:2234
 msgid "Memory ran out while preparing the write.<br>Please free up memory."
 msgstr "准备写入时内存不足。<br>请释放内存。"
 
-#: src/bin/e_config.c:2239
+#: src/bin/e_config.c:2238
 msgid "This is a generic error."
 msgstr "这是个一般性错误。"
 
-#: src/bin/e_config.c:2243
+#: src/bin/e_config.c:2242
 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:2247
+#: src/bin/e_config.c:2246
 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?"
 msgstr "磁盘有 I/O 错误。<br> 可能需要更换磁盘？"
 
-#: src/bin/e_config.c:2251
+#: src/bin/e_config.c:2250
 msgid "You ran out of space while writing the file."
 msgstr "写文件时空间已满。"
 
-#: src/bin/e_config.c:2255
+#: src/bin/e_config.c:2254
 msgid "The file was closed while writing."
 msgstr "写入文件时文件已关闭。"
 
-#: src/bin/e_config.c:2259
+#: src/bin/e_config.c:2258
 msgid "Memory-mapping (mmap) of the file failed."
 msgstr "内存映射(mmap)该文件出错。"
 
-#: src/bin/e_config.c:2263
+#: src/bin/e_config.c:2262
 msgid "X509 Encoding failed."
 msgstr "X509 编码失败。"
 
-#: src/bin/e_config.c:2267
+#: src/bin/e_config.c:2266
 msgid "Signature failed."
 msgstr "签名失败。"
 
-#: src/bin/e_config.c:2271
+#: src/bin/e_config.c:2270
 msgid "The signature was invalid."
 msgstr "签名无效。"
 
-#: src/bin/e_config.c:2275
+#: src/bin/e_config.c:2274
 msgid "Not signed."
 msgstr "未签名。"
 
-#: src/bin/e_config.c:2279
+#: src/bin/e_config.c:2278
 msgid "Feature not implemented."
 msgstr "特性未实现。"
 
-#: src/bin/e_config.c:2283
+#: src/bin/e_config.c:2282
 msgid "PRNG was not seeded."
 msgstr "PRNG 未初始化。"
 
-#: src/bin/e_config.c:2287
+#: src/bin/e_config.c:2286
 msgid "Encryption failed."
 msgstr "加密失败。"
 
-#: src/bin/e_config.c:2291
+#: src/bin/e_config.c:2290
 msgid "Decryption failed."
 msgstr "解密失败。"
 
-#: src/bin/e_config.c:2295
+#: src/bin/e_config.c:2294
 msgid "The error is unknown to Enlightenment."
 msgstr "Enlightenment 未知错误。"
 
-#: src/bin/e_config.c:2317
+#: src/bin/e_config.c:2316
 #, c-format
 msgid ""
 "Enlightenment has had an error while writing<br>its config file.<br>"
@@ -1431,10 +1431,258 @@ msgstr "首选项"
 msgid "Preview"
 msgstr "预览"
 
+#: src/bin/e_configure_option.c:640
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:201
+msgid "Linear"
+msgstr "线性"
+
+#: src/bin/e_configure_option.c:641
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:205
+msgid "Accelerate, then decelerate"
+msgstr "加速后减速"
+
+#: src/bin/e_configure_option.c:642
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:209
+msgid "Accelerate"
+msgstr "加速"
+
+#: src/bin/e_configure_option.c:643
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:213
+msgid "Decelerate"
+msgstr "减速"
+
+#: src/bin/e_configure_option.c:644
+#, fuzzy
+msgid "Pronounced accelerate"
+msgstr "快速加速"
+
+#: src/bin/e_configure_option.c:645
+#, fuzzy
+msgid "Pronounced decelerate"
+msgstr "快速减速"
+
+#: src/bin/e_configure_option.c:646
+#, fuzzy
+msgid "Pronounced accelerate, then decelerate"
+msgstr "快速加速后减速"
+
+#: src/bin/e_configure_option.c:647
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:229
+msgid "Bounce"
+msgstr ""
+
+#: src/bin/e_configure_option.c:648
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:233
+msgid "Bounce more"
+msgstr ""
+
+#: src/bin/e_configure_option.c:668
+#, fuzzy
+msgid "Try not to cover other windows"
+msgstr "同步窗口"
+
+#: src/bin/e_configure_option.c:669
+#, fuzzy
+msgid "Try not to cover gadgets"
+msgstr "添加其他组件"
+
+#: src/bin/e_configure_option.c:670
+#, fuzzy
+msgid "Place at mouse pointer (automatic)"
+msgstr "放在鼠标处"
+
+#: src/bin/e_configure_option.c:671
+#, fuzzy
+msgid "Place at mouse pointer (interactive)"
+msgstr "放在鼠标处"
+
+#: src/bin/e_configure_option.c:691
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:254
+#: src/modules/wizard/page_060.c:33
+msgid "Click"
+msgstr "点击"
+
+#: src/bin/e_configure_option.c:692
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:256
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:342
+msgid "Pointer"
+msgstr "指针"
+
+#: src/bin/e_configure_option.c:693
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:258
+msgid "Sloppy"
+msgstr "随意"
+
+#: src/bin/e_configure_option.c:713
+#, fuzzy
+msgid "Don't set focus on new windows"
+msgstr "不混合全屏窗口"
+
+#: src/bin/e_configure_option.c:714
+#, fuzzy
+msgid "Set focus on all new windows"
+msgstr "匹配单个窗口"
+
+#: src/bin/e_configure_option.c:715
+msgid "Set focus only on all new dialog windows"
+msgstr ""
+
+#: src/bin/e_configure_option.c:716
+msgid ""
+"Set focus only on new dialog windows if dialog's parent window has focus"
+msgstr ""
+
+#: src/bin/e_configure_option.c:736
+#, fuzzy
+msgid "Ignore application"
+msgstr "IBar 应用程序"
+
+#: src/bin/e_configure_option.c:737
+#, fuzzy
+msgid "Animate application window"
+msgstr "最常用程序"
+
+#: src/bin/e_configure_option.c:738
+#, fuzzy
+msgid "Raise and set focus to application window"
+msgstr "窗口边框选择"
+
+#: src/bin/e_configure_option.c:758
+#, fuzzy
+msgid "Resize window, do not resize screen"
+msgstr "包含其他屏幕上的窗口"
+
+#: src/bin/e_configure_option.c:759
+#, fuzzy
+msgid "Resize window and screen"
+msgstr "当鼠标移动到窗口时提升窗口"
+
+#: src/bin/e_configure_option.c:779 src/bin/e_int_border_menu.c:396
+#: 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_configure_option.c:780
+msgid "Expand to maximum size without covering shelves"
+msgstr ""
+
+#: src/bin/e_configure_option.c:782
+msgid "Expand to maximum size ignoring shelves"
+msgstr ""
+
+#: src/bin/e_configure_option.c:803
+#, fuzzy
+msgid "No hinting"
+msgstr "微调"
+
+#: src/bin/e_configure_option.c:804
+#, fuzzy
+msgid "Automatic hinting"
+msgstr "自动"
+
+#: src/bin/e_configure_option.c:805
+#, fuzzy
+msgid "Bytecode hinting"
+msgstr "字节码"
+
+#: src/bin/e_configure_option.c:828
+#: src/modules/conf_display/e_int_config_desklock.c:259
+msgid "Show on all screens"
+msgstr "显示到所有屏幕"
+
+#: src/bin/e_configure_option.c:829
+#, fuzzy
+msgid "Show on screen of pointer"
+msgstr "显示在屏幕 #:"
+
+#: src/bin/e_configure_option.c:830
+#, fuzzy, c-format
+msgid "Show on screen %d"
+msgstr "显示在屏幕 #:"
+
+#: src/bin/e_configure_option.c:867
+#, fuzzy
+msgid "No grouping"
+msgstr "分组"
+
+#: src/bin/e_configure_option.c:868
+#, fuzzy
+msgid "Virtual desktop"
+msgstr "虚拟桌面"
+
+#: src/bin/e_configure_option.c:869 src/bin/e_int_border_remember.c:686
+msgid "Window class"
+msgstr "窗口类别"
+
+#: src/bin/e_configure_option.c:889
+#, fuzzy
+msgid "No separation"
+msgstr "没有选择"
+
+#: src/bin/e_configure_option.c:890
+#, fuzzy
+msgid "Separator bars"
+msgstr "使用分割条"
+
+#: src/bin/e_configure_option.c:891
+#, fuzzy
+msgid "Separate menus"
+msgstr "分割组别"
+
+#: src/bin/e_configure_option.c:911
+#, fuzzy
+msgid "No sorting"
+msgstr "不排序"
+
+#: src/bin/e_configure_option.c:912
+#, fuzzy
+msgid "Alphabetical order"
+msgstr "按字母表顺序"
+
+#: src/bin/e_configure_option.c:913
+#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:148
+msgid "Window stacking layer"
+msgstr "窗口堆叠层"
+
+#: src/bin/e_configure_option.c:914
+msgid "Recently used windows first"
+msgstr ""
+
+#: src/bin/e_configure_option.c:934
+#, fuzzy
+msgid "Group by owner virtual desktop"
+msgstr "桌面分组"
+
+#: src/bin/e_configure_option.c:935
+#, fuzzy
+msgid "Group by current virtual desktop"
+msgstr "当前桌面分组"
+
+#: src/bin/e_configure_option.c:936
+#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:165
+msgid "Separate group"
+msgstr "分割组别"
+
 #: src/bin/e_configure_option.c:957
 msgid "none"
 msgstr ""
 
+#: src/bin/e_configure_option.c:984
+#, fuzzy
+msgid "Allow windows partly out of the screen limits"
+msgstr "允许窗口部分位于屏幕可见范围外"
+
+#: src/bin/e_configure_option.c:985
+#, fuzzy
+msgid "Allow windows completely out of the screen limits"
+msgstr "允许窗口完全位于屏幕可见范围外"
+
+#: src/bin/e_configure_option.c:986
+#, fuzzy
+msgid "Keep windows completely within the screen limits"
+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
@@ -1558,6 +1806,12 @@ msgstr "自动滚动"
 msgid "speed"
 msgstr "回绕速度"
 
+#: src/bin/e_configure_option.c:1491
+#: src/modules/conf_menus/e_int_config_menus.c:306
+#, c-format
+msgid "%5.0f pixels/s"
+msgstr "%5.0f 像素/秒"
+
 #: src/bin/e_configure_option.c:1492
 msgid "Speed at which the menus move onto screen if offscreen"
 msgstr ""
@@ -1575,6 +1829,13 @@ msgstr "快速移动鼠标临界值"
 msgid "move"
 msgstr "删除"
 
+#: src/bin/e_configure_option.c:1494 src/bin/e_configure_option.c:1511
+#: src/modules/conf_menus/e_int_config_menus.c:311
+#: src/modules/conf_window_manipulation/e_int_config_window_display.c:193
+#, c-format
+msgid "%4.0f pixels/s"
+msgstr "%4.0f 像素/秒"
+
 #: src/bin/e_configure_option.c:1495
 msgid ""
 "Moving the mouse faster than this speed over a menu causes menu items to not "
@@ -1592,6 +1853,11 @@ msgstr ""
 msgid "drag"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1497
+#, fuzzy, c-format
+msgid "%2.2f seconds"
+msgstr "%.2f 秒"
+
 #: src/bin/e_configure_option.c:1498
 msgid ""
 "The minimum time before a menu can be closed by clicking the mouse outside "
@@ -1602,6 +1868,20 @@ msgstr ""
 msgid "Menu autoscroll margin"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1500 src/bin/e_configure_option.c:1503
+#: src/bin/e_configure_option.c:1595 src/bin/e_configure_option.c:1599
+#: src/bin/e_configure_option.c:1601 src/bin/e_configure_option.c:1603
+#: src/modules/conf_menus/e_int_config_menus.c:290
+#: src/modules/conf_menus/e_int_config_menus.c:295
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:182
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:189
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:196
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:246
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:251
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f 像素"
+
 #: src/bin/e_configure_option.c:1501
 msgid ""
 "The distance from the edge of the screen before menus begin to move away "
@@ -1662,6 +1942,11 @@ msgstr "动画速度"
 msgid "Framerate"
 msgstr "帧速率"
 
+#: src/bin/e_configure_option.c:1515
+#, fuzzy, c-format
+msgid "%1.0f frames/second"
+msgstr "%1.0f 帧"
+
 #: src/bin/e_configure_option.c:1516
 msgid "The framerate at which animations in Enlightenment occur"
 msgstr ""
@@ -1708,6 +1993,26 @@ msgstr "执行"
 msgid "priority"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1519
+#: 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/bin/e_configure_option.c:1521
 #: src/modules/conf_performance/e_int_config_performance.c:138
 msgid "Image cache size"
@@ -1744,6 +2049,11 @@ msgstr "图片"
 msgid "size"
 msgstr "改变大小"
 
+#: src/bin/e_configure_option.c:1522
+#, fuzzy, c-format
+msgid "%4.0f KiB"
+msgstr "%'.0f KiB"
+
 #: src/bin/e_configure_option.c:1524
 #: src/modules/conf_performance/e_int_config_performance.c:132
 msgid "Font cache size"
@@ -1754,6 +2064,11 @@ msgstr "字体缓存大小"
 msgid "font"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1525
+#, fuzzy, c-format
+msgid "%3.0f KiB"
+msgstr "%'.0f KiB"
+
 #: src/bin/e_configure_option.c:1527
 #, fuzzy
 msgid "Edje cache size"
@@ -1764,16 +2079,37 @@ msgstr "图片缓存大小"
 msgid "edje"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1528
+#: src/modules/conf_performance/e_int_config_performance.c:150
+#, c-format
+msgid "%1.0f files"
+msgstr "%1.0f 个文件"
+
 #: src/bin/e_configure_option.c:1530
 #, fuzzy
 msgid "Edje collection cache size"
 msgstr "缓存 Edje 集合的数目"
 
+#: src/bin/e_configure_option.c:1531
+#: src/modules/conf_performance/e_int_config_performance.c:156
+#, c-format
+msgid "%1.0f collections"
+msgstr "%1.0f 集合"
+
 #: src/bin/e_configure_option.c:1533
 #, fuzzy
 msgid "Cache flushing interval"
 msgstr "缓存刷新间隔"
 
+# ticks 论时间应该是100 毫秒。原翻译翻译为刻度，秒，下三种，个人觉得用英文单位更好。以下同。
+#: src/bin/e_configure_option.c:1534 src/modules/battery/e_mod_config.c:237
+#: src/modules/conf_performance/e_int_config_performance.c:128
+#: src/modules/conf_window_manipulation/e_int_config_window_process.c:109
+#: src/modules/temperature/e_mod_config.c:233
+#, c-format
+msgid "%1.0f ticks"
+msgstr "%1.0f ticks"
+
 #: src/bin/e_configure_option.c:1537
 #, fuzzy
 msgid "Horizontal virtual desktop count"
@@ -1956,6 +2292,12 @@ msgstr ""
 msgid "Window autoraise delay"
 msgstr "窗口显示"
 
+#: src/bin/e_configure_option.c:1584 src/bin/e_configure_option.c:1916
+#: src/modules/pager/e_mod_config.c:249 src/modules/pager/e_mod_config.c:286
+#, c-format
+msgid "%1.1f seconds"
+msgstr "%1.1f 秒"
+
 #: src/bin/e_configure_option.c:1585
 #, fuzzy
 msgid "Revert window focus on desk switch"
@@ -1986,6 +2328,17 @@ msgstr ""
 msgid "Speed to move pointer when warping between windows"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1590
+#: src/modules/conf_window_manipulation/e_int_config_focus.c:337
+#: src/modules/everything/evry_config.c:563
+#: src/modules/everything/evry_config.c:570
+#: src/modules/winlist/e_int_config_winlist.c:231
+#: src/modules/winlist/e_int_config_winlist.c:271
+#: src/modules/winlist/e_int_config_winlist.c:276
+#, c-format
+msgid "%1.2f"
+msgstr "%1.2f"
+
 #: src/bin/e_configure_option.c:1591
 #, fuzzy
 msgid "Windows raise on mouse move/resize"
@@ -2191,6 +2544,12 @@ msgstr "窗口列表标题"
 msgid "Winlist minimum width"
 msgstr "最小宽度"
 
+#: src/bin/e_configure_option.c:1636 src/bin/e_configure_option.c:1638
+#: src/bin/e_configure_option.c:1640 src/bin/e_configure_option.c:1642
+#, fuzzy, c-format
+msgid "%4.0f pixels"
+msgstr "%1.0f 像素"
+
 #: src/bin/e_configure_option.c:1637
 #, fuzzy
 msgid "Winlist minimum height"
@@ -2268,6 +2627,18 @@ msgstr "杀死进程而不是客户端"
 msgid "Window kill delay"
 msgstr "窗口显示"
 
+#: src/bin/e_configure_option.c:1658 src/bin/e_configure_option.c:1661
+#: src/bin/e_configure_option.c:1772 src/bin/e_configure_option.c:1873
+#: src/bin/e_configure_option.c:1905 src/bin/e_configure_option.c:1921
+#: 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/bin/e_configure_option.c:1659
 #, fuzzy
 msgid "Enable window client pinging"
@@ -2481,9 +2852,7 @@ 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
+#: src/bin/e_configure_option.c:2061
 #, fuzzy
 msgid "settings"
 msgstr "设置"
@@ -2581,6 +2950,13 @@ msgstr "设置屏幕保护程序"
 msgid "Desklock activates X seconds after screensaver activates"
 msgstr "当屏幕保护程序运行时锁定"
 
+#: src/bin/e_configure_option.c:1746 src/bin/e_configure_option.c:1749
+#: src/bin/e_configure_option.c:1753 src/bin/e_configure_option.c:1757
+#: src/bin/e_configure_option.c:1765
+#, fuzzy, c-format
+msgid "%2.0f seconds"
+msgstr "%1.0f 秒"
+
 #: src/bin/e_configure_option.c:1747
 #, fuzzy
 msgid "Desklock activates when idle"
@@ -2670,6 +3046,11 @@ msgstr ""
 msgid "Window list menu length limit (characters)"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1803
+#, fuzzy, c-format
+msgid "%1.0f characters"
+msgstr "%1.0f 字符"
+
 #: src/bin/e_configure_option.c:1805
 #, fuzzy
 msgid "Use Enlightenment theme cursor"
@@ -2680,6 +3061,18 @@ msgstr "Enlightenment 无法设定它的记忆设置。\n"
 msgid "Mouse cursor size"
 msgstr "鼠标按键"
 
+#: src/bin/e_configure_option.c:1808 src/bin/e_configure_option.c:1850
+#: src/bin/e_configure_option.c:1875 src/bin/e_configure_option.c:1877
+#: src/bin/e_configure_option.c:1879 src/bin/e_configure_option.c:1881
+#: src/bin/e_configure_option.c:1899 src/bin/e_configure_option.c:1901
+#: src/bin/e_configure_option.c:1903
+#: src/modules/conf_interaction/e_int_config_interaction.c:105
+#: src/modules/conf_interaction/e_int_config_mouse.c:162
+#: src/modules/fileman/e_mod_main.c:394
+#, c-format
+msgid "%1.0f pixels"
+msgstr "%1.0f 像素"
+
 #: src/bin/e_configure_option.c:1810
 #, fuzzy
 msgid "Show mouse cursor"
@@ -2750,6 +3143,11 @@ msgstr "缩略图滚动"
 msgid "Thumbscroll momentum threshold"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1852
+#, fuzzy, c-format
+msgid "%1.0f pixels/second"
+msgstr "%1.0f 像素/秒"
+
 #: src/bin/e_configure_option.c:1853
 #, fuzzy
 msgid "Thumbscroll resistance"
@@ -2832,6 +3230,11 @@ msgstr "自定义缩放系数"
 msgid "scale"
 msgstr "区域"
 
+#: src/bin/e_configure_option.c:1888
+#, fuzzy, c-format
+msgid "%1.2f pixels"
+msgstr "%1.0f 像素"
+
 #: src/bin/e_configure_option.c:1890
 msgid "Use screen DPI for scaling"
 msgstr ""
@@ -2844,6 +3247,12 @@ msgstr ""
 msgid "Custom DPI to use when scaling"
 msgstr ""
 
+#: src/bin/e_configure_option.c:1895
+#: src/modules/conf_theme/e_int_config_scale.c:314
+#, c-format
+msgid "%1.0f DPI"
+msgstr "%1.0f DPI"
+
 #: src/bin/e_configure_option.c:1898
 msgid "System Console primary action icon size"
 msgstr ""
@@ -3045,7 +3454,7 @@ msgstr "光标"
 
 #: src/bin/e_configure_option.c:2068
 #, fuzzy
-msgid "iconif"
+msgid "iconify"
 msgstr "最小化"
 
 #: src/bin/e_container.c:84
@@ -3247,7 +3656,7 @@ msgstr "删除"
 msgid "Cut"
 msgstr "剪切"
 
-#: src/bin/e_entry.c:497 src/bin/e_fm.c:9092 src/bin/e_fm.c:11599
+#: src/bin/e_entry.c:497 src/bin/e_fm.c:9092 src/bin/e_fm.c:11601
 msgid "Copy"
 msgstr "复制"
 
@@ -3501,7 +3910,7 @@ msgstr "新建..."
 msgid "Actions..."
 msgstr "动作..."
 
-#: src/bin/e_fm.c:8891 src/bin/e_fm.c:9113 src/bin/e_fm.c:11612
+#: src/bin/e_fm.c:8891 src/bin/e_fm.c:9113 src/bin/e_fm.c:11614
 msgid "Link"
 msgstr "连接"
 
@@ -3675,7 +4084,7 @@ msgstr "内部文件管理器错误 :("
 msgid "Retry"
 msgstr "重试"
 
-#: src/bin/e_fm.c:10418 src/bin/e_fm.c:10638 src/bin/e_fm.c:11620
+#: src/bin/e_fm.c:10418 src/bin/e_fm.c:10638 src/bin/e_fm.c:11622
 msgid "Abort"
 msgstr "关于"
 
@@ -3867,7 +4276,7 @@ msgstr "组件出错"
 msgid "%s does not support disabling autoscrolling"
 msgstr "%s 不支持禁用自动滚动"
 
-#: src/bin/e_gadcon.c:1682 src/bin/e_int_border_menu.c:139
+#: src/bin/e_gadcon.c:1682 src/bin/e_int_border_menu.c:142
 msgid "Move to"
 msgstr "移动到"
 
@@ -4075,7 +4484,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:696 src/bin/e_int_border_prop.c:501
+#: src/bin/e_int_border_menu.c:722 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"
@@ -4136,85 +4545,84 @@ msgstr "行为锁"
 msgid "Remember these Locks"
 msgstr "记住这些行为锁"
 
-#: src/bin/e_int_border_menu.c:126
+#: src/bin/e_int_border_menu.c:129
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "窗口"
 
-#: src/bin/e_int_border_menu.c:148 src/bin/e_int_border_menu.c:1024
+#: src/bin/e_int_border_menu.c:151 src/bin/e_int_border_menu.c:1050
 msgid "Always on Top"
 msgstr "总在上面"
 
-#: src/bin/e_int_border_menu.c:163 src/bin/e_int_border_prop.c:506
+#: src/bin/e_int_border_menu.c:166 src/bin/e_int_border_prop.c:506
 msgid "Sticky"
 msgstr "粘住"
 
-#: src/bin/e_int_border_menu.c:177
+#: src/bin/e_int_border_menu.c:180
 msgid "Shade"
 msgstr "卷起"
 
-#: 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:193
+msgid "Borderless"
+msgstr "无边框"
 
-#: src/bin/e_int_border_menu.c:438
+#: src/bin/e_int_border_menu.c:464
 msgid "Unmaximize"
 msgstr "还原"
 
-#: src/bin/e_int_border_menu.c:580
+#: src/bin/e_int_border_menu.c:606
 msgid "Edit Icon"
 msgstr "编辑图标"
 
-#: src/bin/e_int_border_menu.c:588
+#: src/bin/e_int_border_menu.c:614
 msgid "Create Icon"
 msgstr "创建图标"
 
-#: src/bin/e_int_border_menu.c:596
+#: src/bin/e_int_border_menu.c:622
 msgid "Add to Favorites Menu"
 msgstr "添加到收藏菜单"
 
-#: src/bin/e_int_border_menu.c:601
+#: src/bin/e_int_border_menu.c:627
 msgid "Add to IBar"
 msgstr "添加到 IBar"
 
-#: src/bin/e_int_border_menu.c:609
+#: src/bin/e_int_border_menu.c:635
 msgid "Create Keyboard Shortcut"
 msgstr "创建快捷键"
 
-#: src/bin/e_int_border_menu.c:655
+#: src/bin/e_int_border_menu.c:681
 #: src/modules/everything/evry_plug_windows.c:438
 msgid "Iconify"
 msgstr "最小化"
 
-#: src/bin/e_int_border_menu.c:705
+#: src/bin/e_int_border_menu.c:731
 msgid "Skip"
 msgstr "跳过"
 
-#: src/bin/e_int_border_menu.c:715 src/modules/conf_theme/e_mod_main.c:120
+#: src/bin/e_int_border_menu.c:741 src/modules/conf_theme/e_mod_main.c:120
 msgid "Border"
 msgstr "边框"
 
-#: src/bin/e_int_border_menu.c:727 src/bin/e_int_border_remember.c:652
+#: src/bin/e_int_border_menu.c:753 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:735
+#: src/bin/e_int_border_menu.c:761
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:128
 msgid "Remember"
 msgstr "记住"
 
-#: src/bin/e_int_border_menu.c:757
+#: src/bin/e_int_border_menu.c:783
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: src/bin/e_int_border_menu.c:933
+#: src/bin/e_int_border_menu.c:959
 #, c-format
 msgid "Screen %d"
 msgstr "屏幕 %d"
 
-#: src/bin/e_int_border_menu.c:1035 src/bin/e_int_border_prop.c:157
+#: src/bin/e_int_border_menu.c:1061 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
@@ -4223,43 +4631,43 @@ msgstr "屏幕 %d"
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:1046
+#: src/bin/e_int_border_menu.c:1072
 msgid "Always Below"
 msgstr "置底"
 
-#: src/bin/e_int_border_menu.c:1090
+#: src/bin/e_int_border_menu.c:1116
 msgid "Pin to Desktop"
 msgstr "固定到桌面"
 
-#: src/bin/e_int_border_menu.c:1101
+#: src/bin/e_int_border_menu.c:1127
 msgid "Unpin from Desktop"
 msgstr "解除固定"
 
-#: src/bin/e_int_border_menu.c:1191
+#: src/bin/e_int_border_menu.c:1217
 msgid "Select Border Style"
 msgstr "选择边框样式"
 
-#: src/bin/e_int_border_menu.c:1203
+#: src/bin/e_int_border_menu.c:1229
 msgid "Use Enlightenment Default Icon Preference"
 msgstr "使用 Enlightenment 默认图标选项"
 
-#: src/bin/e_int_border_menu.c:1211
+#: src/bin/e_int_border_menu.c:1237
 msgid "Use Application Provided Icon"
 msgstr "使用应用程序提供的图标 "
 
-#: src/bin/e_int_border_menu.c:1219
+#: src/bin/e_int_border_menu.c:1245
 msgid "Use User Defined Icon"
 msgstr "使用用户自定义图标"
 
-#: src/bin/e_int_border_menu.c:1228 src/bin/e_int_border_remember.c:784
+#: src/bin/e_int_border_menu.c:1254 src/bin/e_int_border_remember.c:784
 msgid "Offer Resistance"
 msgstr "阻抗"
 
-#: src/bin/e_int_border_menu.c:1289
+#: src/bin/e_int_border_menu.c:1315
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:1299 src/modules/pager/e_mod_main.c:265
+#: src/bin/e_int_border_menu.c:1325 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
@@ -4267,7 +4675,7 @@ msgstr "窗口列表"
 msgid "Pager"
 msgstr "分页器"
 
-#: src/bin/e_int_border_menu.c:1309 src/modules/wizard/page_180.c:24
+#: src/bin/e_int_border_menu.c:1335 src/modules/wizard/page_180.c:24
 msgid "Taskbar"
 msgstr "任务栏"
 
@@ -4578,10 +4986,6 @@ msgstr "全部"
 msgid "Window name"
 msgstr "窗口名称"
 
-#: src/bin/e_int_border_remember.c:686
-msgid "Window class"
-msgstr "窗口类别"
-
 #: src/bin/e_int_border_remember.c:710
 msgid "Window Role"
 msgstr "窗口角色"
@@ -5045,24 +5449,24 @@ msgstr "Enlightenment 无法建立它的文件注册系统。\n"
 msgid "Enlightenment cannot set up its config system.\n"
 msgstr "Enlightenment 无法建立它的配置系统。\n"
 
-#: src/bin/e_main.c:534
+#: src/bin/e_main.c:529
 msgid "Enlightenment cannot initialize E_Randr!\n"
 msgstr "Enlightenment 无法初始化 E_Randr!\n"
 
-#: src/bin/e_main.c:543
+#: src/bin/e_main.c:538
 msgid "Enlightenment cannot set up its environment.\n"
 msgstr "Enlightenment 无法建立它的环境变量。\n"
 
-#: src/bin/e_main.c:559
+#: src/bin/e_main.c:554
 #, fuzzy
 msgid "Enlightenment cannot set up its scale system.\n"
 msgstr "Enlightenment 无法建立它的刻度系统。"
 
-#: src/bin/e_main.c:568
+#: src/bin/e_main.c:563
 msgid "Enlightenment cannot set up its pointer system.\n"
 msgstr "Enlightenment 无法建立它的指针系统。\n"
 
-#: src/bin/e_main.c:577
+#: src/bin/e_main.c:572
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
@@ -5070,15 +5474,15 @@ msgstr ""
 "Enlightenment 无法设置路径以打开文件。\n"
 "可能您的内存用完了？"
 
-#: src/bin/e_main.c:594
+#: src/bin/e_main.c:589
 msgid "Enlightenment cannot set up its font system.\n"
 msgstr "Enlightenment 无法建立它的字体系统。\n"
 
-#: src/bin/e_main.c:611
+#: src/bin/e_main.c:606
 msgid "Enlightenment cannot set up its theme system.\n"
 msgstr "Enlightenment 无法建立它的主题系统。\n"
 
-#: src/bin/e_main.c:625
+#: src/bin/e_main.c:620
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you lack permissions on ~/.cache/efreet or are\n"
@@ -5088,19 +5492,19 @@ msgstr ""
 "可能是您没有 ~/.cache/efreet 的操作权限\n"
 "或者是内存溢出或磁盘空间问题？"
 
-#: src/bin/e_main.c:636
+#: src/bin/e_main.c:631
 msgid "Setup Actions"
 msgstr "设置动作"
 
-#: src/bin/e_main.c:640
+#: src/bin/e_main.c:635
 msgid "Enlightenment cannot set up its actions system.\n"
 msgstr "Enlightenment 无法建立它的动作系统。\n"
 
-#: src/bin/e_main.c:647
+#: src/bin/e_main.c:642
 msgid "Setup Screens"
 msgstr "设置屏幕"
 
-#: src/bin/e_main.c:651
+#: src/bin/e_main.c:646
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -5108,15 +5512,15 @@ msgstr ""
 "Enlightenment 在您的所有的屏幕上建立窗口管理失败。\n"
 "可能有另外一个窗口管理器在运行？\n"
 
-#: src/bin/e_main.c:663
+#: src/bin/e_main.c:658
 msgid "Enlightenment cannot set up its init screen.\n"
 msgstr "Enlightenment 无法建立它的初始化屏幕。\n"
 
-#: src/bin/e_main.c:677
+#: src/bin/e_main.c:672
 msgid "Starting International Support"
 msgstr "开启国际化支持"
 
-#: src/bin/e_main.c:681
+#: src/bin/e_main.c:676
 msgid "Enlightenment cannot set up its intl system.\n"
 msgstr "Enlightenment 无法建立它的国际化系统。\n"
 
@@ -5879,6 +6283,11 @@ msgstr "设置为主题"
 msgid "Select Theme"
 msgstr "选择主题"
 
+#: src/bin/e_toolbar.c:128
+#, fuzzy
+msgid "EFM Toolbar"
+msgstr "工具条"
+
 #: src/bin/e_toolbar.c:343
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移动/缩放项目"
@@ -6266,15 +6675,6 @@ msgstr "使用桌面告警通知"
 msgid "Check every:"
 msgstr "检查间隔："
 
-# ticks 论时间应该是100 毫秒。原翻译翻译为刻度，秒，下三种，个人觉得用英文单位更好。以下同。
-#: src/modules/battery/e_mod_config.c:237
-#: src/modules/conf_performance/e_int_config_performance.c:128
-#: src/modules/conf_window_manipulation/e_int_config_window_process.c:109
-#: src/modules/temperature/e_mod_config.c:233
-#, c-format
-msgid "%1.0f ticks"
-msgstr "%1.0f ticks"
-
 #: src/modules/battery/e_mod_config.c:242
 msgid "Suspend when below:"
 msgstr "挂起，当电量低于:"
@@ -6661,7 +7061,6 @@ msgid "Modes"
 msgstr "模式"
 
 #: 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 "Control Panel"
 msgstr "配置面板"
@@ -6803,89 +7202,47 @@ msgid "IBar Other"
 msgstr "IBar 其他项"
 
 #: src/modules/conf_applications/e_mod_main.c:71
-msgid "new app launcher"
-msgstr ""
-
-#: src/modules/conf_applications/e_mod_main.c:71
 #, fuzzy
 msgid "Create a new application launcher"
 msgstr "创建应用程序启动器"
 
 #: src/modules/conf_applications/e_mod_main.c:74
-msgid "apps"
-msgstr ""
-
-#: src/modules/conf_applications/e_mod_main.c:74
 #, fuzzy
 msgid "Application launchers"
 msgstr "创建应用程序启动器"
 
 #: src/modules/conf_applications/e_mod_main.c:77
 #, fuzzy
-msgid "favorite apps"
-msgstr "收藏"
-
-#: src/modules/conf_applications/e_mod_main.c:77
-#, fuzzy
 msgid "Favorite applications"
 msgstr "最常用程序"
 
 #: src/modules/conf_applications/e_mod_main.c:80
-msgid "ibar apps"
-msgstr ""
-
-#: src/modules/conf_applications/e_mod_main.c:80
 #, fuzzy
 msgid "Ibar applications"
 msgstr "IBar 应用程序"
 
 #: src/modules/conf_applications/e_mod_main.c:83
 #, fuzzy
-msgid "desklock apps"
-msgstr "桌面锁定密码"
-
-#: src/modules/conf_applications/e_mod_main.c:83
-#, fuzzy
 msgid "Desk lock applications"
 msgstr "无应用程序"
 
 #: src/modules/conf_applications/e_mod_main.c:86
 #, fuzzy
-msgid "deskunlock apps"
-msgstr "桌面锁定密码"
-
-#: src/modules/conf_applications/e_mod_main.c:86
-#, fuzzy
 msgid "Desk unlock applications"
 msgstr "屏幕解锁应用程序"
 
 #: src/modules/conf_applications/e_mod_main.c:89
 #, fuzzy
-msgid "restart apps"
-msgstr "重启"
-
-#: src/modules/conf_applications/e_mod_main.c:89
-#, fuzzy
 msgid "Enlightenment restart applications"
 msgstr "允许应用程序使用图标主题"
 
 #: src/modules/conf_applications/e_mod_main.c:92
 #, fuzzy
-msgid "startup apps"
-msgstr "启动"
-
-#: src/modules/conf_applications/e_mod_main.c:92
-#, fuzzy
 msgid "Enlightenment start applications"
 msgstr "允许应用程序使用图标主题"
 
 #: src/modules/conf_applications/e_mod_main.c:95
 #, fuzzy
-msgid "default apps"
-msgstr "默认"
-
-#: src/modules/conf_applications/e_mod_main.c:95
-#, fuzzy
 msgid "Enlightenment default applications"
 msgstr "Enlightenment 默认"
 
@@ -7352,31 +7709,16 @@ msgstr "输入"
 
 #: src/modules/conf_bindings/e_mod_main.c:50
 #, fuzzy
-msgid "key bindings"
-msgstr "键绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:50
-#, fuzzy
 msgid "Key binding settings"
 msgstr "键绑定设置"
 
 #: src/modules/conf_bindings/e_mod_main.c:53
 #, fuzzy
-msgid "mouse bindings"
-msgstr "鼠标绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:53
-#, fuzzy
 msgid "Mouse binding settings"
 msgstr "鼠标绑定设置"
 
 #: src/modules/conf_bindings/e_mod_main.c:56
 #, fuzzy
-msgid "ACPI bindings"
-msgstr "ACPI 绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:56
-#, fuzzy
 msgid "ACPI binding settings"
 msgstr "键绑定设置"
 
@@ -7386,21 +7728,11 @@ msgstr ""
 
 #: src/modules/conf_bindings/e_mod_main.c:60
 #, fuzzy
-msgid "edge bindings"
-msgstr "边缘绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:60
-#, fuzzy
 msgid "Screen edge binding settings"
 msgstr "边缘绑定设置"
 
 #: src/modules/conf_bindings/e_mod_main.c:63
 #, fuzzy
-msgid "signal bindings"
-msgstr "信号绑定"
-
-#: src/modules/conf_bindings/e_mod_main.c:63
-#, fuzzy
 msgid "Edje signal binding settings"
 msgstr "信号绑定设置"
 
@@ -7633,11 +7965,6 @@ 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 "混成设置"
 
@@ -7732,11 +8059,6 @@ 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"
 
@@ -7796,10 +8118,6 @@ msgstr "锁定"
 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 "显示在当前屏幕"
@@ -7808,25 +8126,6 @@ msgstr "显示在当前屏幕"
 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 "登录框"
@@ -7835,15 +8134,6 @@ msgstr "登录框"
 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 "空闲指定时间后锁定"
@@ -8034,13 +8324,6 @@ msgstr "启用缩略图滚动"
 msgid "Threshold for a thumb drag"
 msgstr "缩略图拖放阈值"
 
-#: src/modules/conf_interaction/e_int_config_interaction.c:105
-#: src/modules/conf_interaction/e_int_config_mouse.c:162
-#: src/modules/fileman/e_mod_main.c:394
-#, c-format
-msgid "%1.0f pixels"
-msgstr "%1.0f 像素"
-
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 msgid "Threshold for applying drag momentum"
 msgstr "启动拖放的阈值"
@@ -8224,21 +8507,16 @@ msgstr "区域"
 msgid "Language"
 msgstr "语言"
 
-#: src/modules/conf_intl/e_mod_main.c:38 src/modules/conf_intl/e_mod_main.c:41
-#: src/modules/conf_intl/e_mod_main.c:45 src/modules/xkbswitch/e_mod_main.c:83
-#, fuzzy
-msgid "language"
-msgstr "语言"
-
 #: src/modules/conf_intl/e_mod_main.c:38
 #, fuzzy
 msgid "Language settings"
 msgstr "语言设置"
 
-#: src/modules/conf_intl/e_mod_main.c:41
+#: src/modules/conf_intl/e_mod_main.c:38 src/modules/conf_intl/e_mod_main.c:41
+#: src/modules/conf_intl/e_mod_main.c:45 src/modules/xkbswitch/e_mod_main.c:83
 #, fuzzy
-msgid "desklock language"
-msgstr "桌面锁定语言设置"
+msgid "language"
+msgstr "语言"
 
 #: src/modules/conf_intl/e_mod_main.c:41
 #, fuzzy
@@ -8247,11 +8525,6 @@ msgstr "桌面锁定语言设置"
 
 #: src/modules/conf_intl/e_mod_main.c:45
 #, fuzzy
-msgid "input method"
-msgstr "输入法错误"
-
-#: src/modules/conf_intl/e_mod_main.c:45
-#, fuzzy
 msgid "Input method settings"
 msgstr "输入法设置"
 
@@ -8310,17 +8583,6 @@ msgstr "菜单"
 msgid "Margin"
 msgstr "边距"
 
-#: src/modules/conf_menus/e_int_config_menus.c:290
-#: src/modules/conf_menus/e_int_config_menus.c:295
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:182
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:189
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:196
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:246
-#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:251
-#, c-format
-msgid "%2.0f pixels"
-msgstr "%2.0f 像素"
-
 #: src/modules/conf_menus/e_int_config_menus.c:293
 msgid "Cursor Margin"
 msgstr "鼠标指针边距"
@@ -8333,22 +8595,11 @@ msgstr "自动滚动"
 msgid "Menu Scroll Speed"
 msgstr "菜单滚动速度"
 
-#: src/modules/conf_menus/e_int_config_menus.c:306
-#, c-format
-msgid "%5.0f pixels/s"
-msgstr "%5.0f 像素/秒"
-
 #: src/modules/conf_menus/e_int_config_menus.c:309
 #, fuzzy
 msgid "Fast Mouse Move Threshold"
 msgstr "快速移动鼠标临界值"
 
-#: src/modules/conf_menus/e_int_config_menus.c:311
-#: src/modules/conf_window_manipulation/e_int_config_window_display.c:193
-#, c-format
-msgid "%4.0f pixels/s"
-msgstr "%4.0f 像素/秒"
-
 #: src/modules/conf_menus/e_int_config_menus.c:314
 msgid "Click Drag Timeout"
 msgstr "点击拖拽超时"
@@ -8430,21 +8681,11 @@ msgstr "搜索目录"
 
 #: src/modules/conf_paths/e_mod_main.c:35
 #, fuzzy
-msgid "search directories"
-msgstr "搜索目录"
-
-#: src/modules/conf_paths/e_mod_main.c:35
-#, fuzzy
 msgid "Search directory settings"
 msgstr "搜索目录"
 
 #: src/modules/conf_paths/e_mod_main.c:38
 #, fuzzy
-msgid "environment variables"
-msgstr "环境变量"
-
-#: src/modules/conf_paths/e_mod_main.c:38
-#, fuzzy
 msgid "Environment variable settings"
 msgstr "环境变量"
 
@@ -8501,20 +8742,10 @@ msgstr "缓存"
 msgid "Number of Edje files to cache"
 msgstr "缓存 Edje 文件的数目"
 
-#: src/modules/conf_performance/e_int_config_performance.c:150
-#, c-format
-msgid "%1.0f files"
-msgstr "%1.0f 个文件"
-
 #: src/modules/conf_performance/e_int_config_performance.c:154
 msgid "Number of Edje collections to cache"
 msgstr "缓存 Edje 集合的数目"
 
-#: src/modules/conf_performance/e_int_config_performance.c:156
-#, c-format
-msgid "%1.0f collections"
-msgstr "%1.0f 集合"
-
 #: src/modules/conf_performance/e_int_config_performance.c:159
 msgid "Edje Cache"
 msgstr "Edje 缓存"
@@ -8600,10 +8831,6 @@ msgid "Restore On Startup"
 msgstr "启动时锁定"
 
 #: src/modules/conf_randr/e_mod_main.c:31
-msgid "randr"
-msgstr ""
-
-#: src/modules/conf_randr/e_mod_main.c:31
 msgid "Screen resolution and orientation settings"
 msgstr ""
 
@@ -8623,11 +8850,6 @@ msgstr "确认删除书架"
 
 #: src/modules/conf_shelves/e_mod_main.c:38
 #, fuzzy
-msgid "shelves"
-msgstr "书架"
-
-#: src/modules/conf_shelves/e_mod_main.c:38
-#, fuzzy
 msgid "Shelf settings"
 msgstr "书架设定"
 
@@ -9136,11 +9358,6 @@ msgstr "按屏幕 DPI 比例缩放"
 msgid "Base DPI (Currently %i DPI)"
 msgstr "基准 DPI(当前 %i DPI)"
 
-#: src/modules/conf_theme/e_int_config_scale.c:314
-#, c-format
-msgid "%1.0f DPI"
-msgstr "%1.0f DPI"
-
 #: src/modules/conf_theme/e_int_config_scale.c:318
 msgid "Custom scaling factor"
 msgstr "自定义缩放系数"
@@ -9336,11 +9553,6 @@ msgstr "缩放"
 
 #: src/modules/conf_theme/e_mod_main.c:168
 #, fuzzy
-msgid "themes"
-msgstr "主题"
-
-#: src/modules/conf_theme/e_mod_main.c:168
-#, fuzzy
 msgid "Enlightenment theme settings"
 msgstr "Enlightenment 无法设定它的记忆设置。\n"
 
@@ -9351,11 +9563,6 @@ msgstr "桌面壁纸"
 
 #: src/modules/conf_theme/e_mod_main.c:176
 #, fuzzy
-msgid "colors"
-msgstr "颜色"
-
-#: src/modules/conf_theme/e_mod_main.c:176
-#, fuzzy
 msgid "Enlightenment color settings"
 msgstr "Enlightenment 无法设定它的记忆设置。\n"
 
@@ -9366,11 +9573,6 @@ msgstr "颜色"
 
 #: src/modules/conf_theme/e_mod_main.c:180
 #, fuzzy
-msgid "fonts"
-msgstr "字体"
-
-#: src/modules/conf_theme/e_mod_main.c:180
-#, fuzzy
 msgid "Enlightenment font settings"
 msgstr "Enlightenment 路径"
 
@@ -9418,10 +9620,6 @@ msgstr "分组"
 msgid "Alphabetical"
 msgstr "按字母表顺序"
 
-#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:148
-msgid "Window stacking layer"
-msgstr "窗口堆叠层"
-
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:151
 msgid "Most recently used"
 msgstr "最近使用"
@@ -9438,10 +9636,6 @@ msgstr "桌面分组"
 msgid "Group with current desktop"
 msgstr "当前桌面分组"
 
-#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:165
-msgid "Separate group"
-msgstr "分割组别"
-
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:168
 msgid "Warp to owning desktop"
 msgstr "延伸到自己的桌面"
@@ -9489,20 +9683,6 @@ msgstr "当鼠标移动到窗口时提升窗口"
 msgid "Focus Policy"
 msgstr "策略"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:254
-#: src/modules/wizard/page_060.c:33
-msgid "Click"
-msgstr "点击"
-
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:256
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:342
-msgid "Pointer"
-msgstr "指针"
-
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:258
-msgid "Sloppy"
-msgstr "随意"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:262
 msgid "New Window Focus"
 msgstr "新窗口焦点"
@@ -9577,16 +9757,6 @@ msgstr "滑动指针到新聚焦的窗口"
 msgid "Warp speed"
 msgstr "回绕速度"
 
-#: src/modules/conf_window_manipulation/e_int_config_focus.c:337
-#: src/modules/everything/evry_config.c:563
-#: src/modules/everything/evry_config.c:570
-#: src/modules/winlist/e_int_config_winlist.c:231
-#: src/modules/winlist/e_int_config_winlist.c:271
-#: src/modules/winlist/e_int_config_winlist.c:276
-#, c-format
-msgid "%1.2f"
-msgstr "%1.2f"
-
 #: src/modules/conf_window_manipulation/e_int_config_focus.c:347
 msgid "Other Settings"
 msgstr "其它设置"
@@ -9689,22 +9859,6 @@ msgstr "新窗口"
 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 "快速加速"
@@ -9717,14 +9871,6 @@ msgstr "快速减速"
 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 "阴影"
@@ -9941,11 +10087,6 @@ msgstr "没有选择"
 
 #: src/modules/conf_window_remembers/e_mod_main.c:28
 #, fuzzy
-msgid "window remembers"
-msgstr "窗口记忆"
-
-#: src/modules/conf_window_remembers/e_mod_main.c:28
-#, fuzzy
 msgid "Window remember settings"
 msgstr "窗口记忆"
 
@@ -11012,6 +11153,11 @@ msgstr "动画"
 msgid "Background Options"
 msgstr "背景选项"
 
+#: src/modules/gadman/e_mod_gadman.c:124
+#, fuzzy
+msgid "Desktop Hover"
+msgstr "desktop 文件"
+
 #: src/modules/gadman/e_mod_gadman.c:1013
 msgid "Begin move/resize"
 msgstr "开始移动/缩放"
@@ -11087,7 +11233,7 @@ msgstr "您正在删除 %s。<br><br>确定删除它吗？"
 msgid "Are you sure you want to delete this bar source?"
 msgstr "确定要删除这个 bar 吗？"
 
-#: src/modules/ibar/e_mod_main.c:285 src/modules/ibar/e_mod_main.c:1813
+#: src/modules/ibar/e_mod_main.c:285 src/modules/ibar/e_mod_main.c:1809
 msgid "IBar"
 msgstr "IBar"
 
@@ -11100,7 +11246,7 @@ msgstr "创建新图标"
 msgid "Icon %s"
 msgstr "图标 %s"
 
-#: src/modules/ibar/e_mod_main.c:1813
+#: src/modules/ibar/e_mod_main.c:1809
 msgid "Focus IBar"
 msgstr "聚焦 IBar"
 
@@ -11423,7 +11569,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Ensure there's no other module acting as a server and that D-Bus is "
-"correctly installed and  running"
+"correctly installed and running"
 msgstr "DBus 初始化出错！请检查 dbug 是否已经安装正确并已运行。"
 
 #: src/modules/notification/e_mod_main.c:261
@@ -11533,11 +11679,6 @@ msgstr "弹窗高度"
 msgid "Popup duration"
 msgstr "弹窗持续时间"
 
-#: src/modules/pager/e_mod_config.c:249 src/modules/pager/e_mod_config.c:286
-#, c-format
-msgid "%1.1f seconds"
-msgstr "%1.1f 秒"
-
 #: src/modules/pager/e_mod_config.c:256
 msgid "Pager action popup height"
 msgstr "分页器操作弹出窗口高度"
@@ -12155,23 +12296,23 @@ msgstr "系统控制"
 msgid "Syscon"
 msgstr "Syscon"
 
-#: src/modules/systray/e_mod_main.c:255
+#: src/modules/systray/e_mod_main.c:258
 msgid "Another systray exists"
 msgstr "有另一个系统托盘存在"
 
-#: src/modules/systray/e_mod_main.c:256
+#: src/modules/systray/e_mod_main.c:259
 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
+#: src/modules/systray/e_mod_main.c:267 src/modules/systray/e_mod_xembed.c:395
 msgid "Systray Error"
 msgstr "系统托盘出错"
 
-#: src/modules/systray/e_mod_main.c:265
+#: src/modules/systray/e_mod_main.c:268
 msgid "Systray cannot work in a shelf that is set to below everything."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:417
+#: src/modules/systray/e_mod_main.c:420
 msgid "Systray"
 msgstr "系统托盘"
 
@@ -12711,11 +12852,6 @@ 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 "键盘设置"
 
@@ -12723,6 +12859,98 @@ msgstr "键盘设置"
 msgid "NONE"
 msgstr ""
 
+#, fuzzy
+#~ msgid "favorite apps"
+#~ msgstr "收藏"
+
+#, fuzzy
+#~ msgid "desklock apps"
+#~ msgstr "桌面锁定密码"
+
+#, fuzzy
+#~ msgid "deskunlock apps"
+#~ msgstr "桌面锁定密码"
+
+#, fuzzy
+#~ msgid "restart apps"
+#~ msgstr "重启"
+
+#, fuzzy
+#~ msgid "startup apps"
+#~ msgstr "启动"
+
+#, fuzzy
+#~ msgid "default apps"
+#~ msgstr "默认"
+
+#, fuzzy
+#~ msgid "key bindings"
+#~ msgstr "键绑定"
+
+#, fuzzy
+#~ msgid "mouse bindings"
+#~ msgstr "鼠标绑定"
+
+#, fuzzy
+#~ msgid "ACPI bindings"
+#~ msgstr "ACPI 绑定"
+
+#, fuzzy
+#~ msgid "edge bindings"
+#~ msgstr "边缘绑定"
+
+#, fuzzy
+#~ msgid "signal bindings"
+#~ msgstr "信号绑定"
+
+#, fuzzy
+#~ msgid "comp_settings"
+#~ msgstr "混成设置"
+
+#, fuzzy
+#~ msgid "profiles"
+#~ msgstr "用户环境"
+
+#, fuzzy
+#~ msgid "desklock language"
+#~ msgstr "桌面锁定语言设置"
+
+#, fuzzy
+#~ msgid "input method"
+#~ msgstr "输入法错误"
+
+#, fuzzy
+#~ msgid "search directories"
+#~ msgstr "搜索目录"
+
+#, fuzzy
+#~ msgid "environment variables"
+#~ msgstr "环境变量"
+
+#, fuzzy
+#~ msgid "shelves"
+#~ msgstr "书架"
+
+#, fuzzy
+#~ msgid "themes"
+#~ msgstr "主题"
+
+#, fuzzy
+#~ msgid "colors"
+#~ msgstr "颜色"
+
+#, fuzzy
+#~ msgid "fonts"
+#~ msgstr "字体"
+
+#, fuzzy
+#~ msgid "window remembers"
+#~ msgstr "窗口记忆"
+
+#, fuzzy
+#~ msgid "xkb layouts"
+#~ msgstr "下一个键盘布局"
+
 #~ msgid "Pane"
 #~ msgstr "面板"
 
@@ -12798,9 +13026,6 @@ msgstr ""
 #~ msgid "On"
 #~ msgstr "开"
 
-#~ msgid "Borderless"
-#~ msgstr "无边框"
-
 #~ msgid "Virtual Keyboard"
 #~ msgstr "虚拟键盘"